Merge branch 'test' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

src/views/shop/components/detailModal.vue

@@ -15,6 +15,9 @@
                     <el-form-item label="小程序appid">
                         <el-input v-model="form.smallAppid" placeholder="请输入小程序appid"></el-input>
                     </el-form-item>
+                    <el-form-item label="支付宝appid">
+                        <el-input v-model="form.alipaySmallAppid" placeholder="请输入支付宝appid"></el-input>
+                    </el-form-item>
                     <el-form-item label="店铺id">
                         <el-input v-model="form.storeId" placeholder="请输入店铺id"></el-input>
                     </el-form-item>
@@ -52,7 +55,8 @@ export default ({
                 status: 1,
                 appId: '',
                 smallAppid: '',
-                storeId: ''
+                storeId: '',
+                alipaySmallAppid:''
             }
         }
     },
@@ -94,6 +98,7 @@ export default ({
                 this.form.status = res.status
                 this.form.appId = res.appId
                 this.form.smallAppid = res.smallAppid
+                this.form.alipaySmallAppid = res.alipaySmallAppid
                 this.form.storeId = res.storeId
             } catch (error) {
                 console.log(error)

src/views/shop/notifications/index.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="app-container">
-        <div class="head-container">
+        <!-- <div class="head-container">
             <el-row :gutter="20">
                 <el-col :span="3">
                     店铺推送： <el-switch v-model="alldata.allState" :active-value="1" :inactive-value="0"
@@ -19,7 +19,21 @@
                         @change="changeEvent(alldata.stockState, 0)"></el-switch>
                 </el-col>
             </el-row>
-        </div>
+        </div> -->
+
+        <!-- 查看图片 -->
+        <el-button v-if="url" type="primary" @click="dialogVisible = true" style="margin-bottom: 28px;">查看图片</el-button>
+        <el-dialog title="提示" :visible.sync="dialogVisible" width="30%" :before-close="handleClose">
+            <div style="width: 100%;text-align: center;">
+                <el-image style="width: 200px; height: 200px;" :src="url"></el-image>
+            </div>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="downloadUrl">下载</el-button>
+            </span>
+        </el-dialog>
+
+
         <div class="head-container" id="table_drag">
             <el-table ref="table" :data="tableData.data" v-loading="tableData.loading" row-key="id">
                 <el-table-column label="头像">
@@ -70,7 +84,7 @@
 </template>
 
 <script>
-import { msgall, msginfo, shopState, state, delmsg } from '@/api/notifications'
+import { msgall, msginfo, shopState, state, delmsg, subQrCode } from '@/api/notifications'
 export default {
     data() {
         return {
@@ -87,14 +101,37 @@ export default {
                 conState: 0,
                 opeState: 0,
                 stockState: 0,
-            }
+            },
+            url: '',
+            dialogVisible: false
         }
     },
     mounted() {
         this.getTableData()
         this.getlist()
+        this.getsubQrCode()
     },
     methods: {
+        downloadUrl() {
+            let link = document.createElement("a");
+            //创建一个a标签
+            link.style.display = "none";
+            //将a标签隐藏
+            link.href = this.url;
+            document.body.appendChild(link);
+            //将上面创建的a标签加入到body的尾部
+            link.click();
+            //执行a标签
+            this.dialogVisible = false
+        },
+        // 二维码
+        async getsubQrCode() {
+            let res = await subQrCode({
+                shopId: localStorage.getItem('shopId')
+            })
+            this.url = res
+
+        },
         async getlist() {
             let res = await state({
                 shopId: localStorage.getItem('shopId'),