1

src/components/StoreDesign/AppletPublishing.vue

@@ -35,7 +35,7 @@
         </div>
         <el-button type="primary" size="small" @click="JumpDeploy" style="margin-top: 20px">可跳转小程序设置</el-button>
         <div style="text-align: center;">
-          <el-button type="primary" @click="active=1" >下一步</el-button>
+          <el-button type="primary" @click="updateSet" >下一步</el-button>
         </div>
 
       </div>
@@ -101,9 +101,10 @@
       </div>
     </el-dialog>
     <!--可跳转小程序设置-->
+    <!--TODO 不确定参数是否是这样-->
     <el-dialog title="小程序码" :visible.sync="rightshow" width="418px">
       <div style="text-align: center;">
-        <img src="" alt="" style="width: 200px;">
+        <img :src="getWeiXin" alt="" style="width: 200px;">
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="rightshow=false" >确定</el-button>
@@ -130,6 +131,7 @@
             getQRcode_load:false,
             upload_load:false,
             getLoginQRcode:'',
+            getWeiXin:'',
             previewQRcode:'',
             Version:'',
           }
@@ -173,6 +175,15 @@
             }
           })
         },
+        updateSet(){
+          this.apipost("/api/Publish/UpdateSetting", {}, res => {
+            if (res.data.resultCode == 1) {
+              this.active=1;
+            } else {
+              this.Info(res.data.message);
+            }
+          })
+        },
         getSignQRcode(){
           this.getQRcode_load = true
           this.apipost("/api/Publish/GetLoginAppletWeChat", {}, res => {
@@ -221,7 +232,14 @@
           // })
         },
         getApplet(){ //获取小程序的二维码
-          this.rightshow=true
+          this.rightshow=true;
+          this.apipost("/api/Publish/GetWeiXinShare", {}, res => {
+            if (res.data.resultCode == 1) {
+              this.getWeiXin = res.data.data;
+            } else {
+              this.Info(res.data.message);
+            }
+          })
         },
         UpdateLivePlayBtn(val){
           this.apipost("/api/Tenant/UpdateLivePlayerPlugin", {'LivePlayerPlugin':val}, res => {

src/components/StoreDesign/wexinappmsg.vue

@@ -120,7 +120,7 @@
         </div>
       </div>
       <el-button size="small" type="primary" @click="UpdateMallDistributionMsg()">保 存</el-button>
-      <el-button size="small" type="primary">生成测试二维码</el-button>
+      <!--<el-button size="small" type="primary">生成测试二维码</el-button>-->
     </template>
   </div>
 </template>

src/components/sallCenter/couponManage.vue

@@ -78,8 +78,8 @@
           label="数量"
           width="150">
           <template slot-scope="scope">
-            <div>总数量：{{scope.row.TotalNum ==-1? '无限制领取':scope.row.TotalNum}}</div>
-            <div v-if="scope.row.TotalNum !=-1">剩余发放数：{{scope.row.ResidueNum}}</div>
+            <div>总数量：{{scope.row.TotalNum ==-1? '无限制领取':scope.row.TotalNum+scope.row.ResidueNum}}</div>
+            <div v-if="scope.row.TotalNum !=-1">剩余发放数：{{scope.row.TotalNum}}</div>
           </template>
         </el-table-column>