Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc

src/components/userinfo/accountsetting/components/boundwx.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="boundwx-container">
     <div class="contenttitle">
-      <span v-if="!userinfo.openIdAppDTDL">绑定微信</span>
+      <span v-if="!userinfo.openIdAppDTDL">打开小程序</span>
       <span v-else>已绑定微信</span>
     </div>
     <div class="contentbody" v-if="!userinfo.openIdAppDTDL">
       <div>
         <a-spin tip="加载中..." :spinning="isspinning"></a-spin>
 
-        <img :src="qrcodeurl" alt v-if="!isspinning" />
+        <img src="../../../../assets/wx.jpg" alt v-if="!isspinning" />
       </div>
       <div style="margin-top: 10px">微信扫一扫</div>
     </div>
@@ -62,11 +62,11 @@ export default {
     async getUserWx() {
       try {
         this.isspinning = true
-        const { data } = await getUserWxApi()
-        console.log(data)
-        if (data.status === 200) {
-          this.qrcodeurl = data.data
-        }
+        // const { data } = await getUserWxApi()
+        // console.log(data)
+        // if (data.status === 200) {
+          this.qrcodeurl = ""
+        // }
       } catch (error) {
         console.log(error)
       }

src/components/userinfo/accountsetting/inedex.vue

@@ -85,7 +85,7 @@
           </li>
           <li @click="pushto('/accountsetting/boundwx')" :class="{ tagactive: activelist === 2 }">
             <span>
-              <i class="iconfont icon-weixin1"></i>绑定微信
+              <i class="iconfont icon-weixin1"></i>打开小程序
             </span>
             <span>
               <span v-if="userinfo.openIdAppDTDL">已绑定</span>