切换专柜修改

wx_application/public/qrCode/index.html

@@ -64,10 +64,10 @@
             border-top-right-radius: 1rem;
             background: white;
             background:
-                    linear-gradient(135deg, transparent 0, white 0) top left,
-                    linear-gradient(-135deg, transparent 0, white 0) top right,
-                    radial-gradient(circle at bottom right, transparent 2rem, white 0) bottom right,
-                    radial-gradient(circle at bottom left, transparent 2rem, white 0) bottom left;
+                linear-gradient(135deg, transparent 0, white 0) top left,
+                linear-gradient(-135deg, transparent 0, white 0) top right,
+                radial-gradient(circle at bottom right, transparent 2rem, white 0) bottom right,
+                radial-gradient(circle at bottom left, transparent 2rem, white 0) bottom left;
             background-size: 50% 50%;
             background-repeat: no-repeat;
             display: flex;

wx_application/public/register/index.html

@@ -54,8 +54,7 @@
   const showQRInfo = () => {
     // let pageUri = `${nowUrl}&detailid=${voucherId}&actionid=${activeId}&unionid=${unionId}`;
     let storecode = "181"
-    let pageUri = `pages/user/register/register?storeCode=
-${storecode}`;
+    let pageUri = `pages/user/register/register?storeCode=${storecode}`;
     let pageUrl = `http://139.155.48.151:8085/workWx/auth/oauth2/wxMiniQrCode?pageUri=${pageUri}`;
 
     $.ajax({

wx_application/src/views/counter/changeCounter.vue

 <template>
   <div class="container">
-    <van-radio-group v-model="radio" class="nobr">
-      <van-cell-group @change="handleStoreChange" >
+    <van-radio-group v-model="radio" class="nobr"  @change="handleStoreChange">
+      <van-cell-group >
         <van-cell   v-for="(item,index) in list" :key="index"   >
           <div class="list">
             <div class="left">
@@ -32,6 +32,8 @@ export default {
   },
   created() {  
     this.radio = sessionStorage.getItem('oyStallCode')
+    console.log(sessionStorage.getItem('oyStallCode'),'切换');
+    
     this.getList()  
   },
   methods: {
@@ -50,13 +52,14 @@ export default {
       })
     },
     handleStoreChange(val) {
-    sessionStorage.setItem('oyStallCode',val)    
-      let obj = this.list.find(function (obj) {
-        return obj.oyStallCode == val;//取出this.studentL里的id为1的那条数据所有的信息
-      })
-      console.log(obj,'obj')     
-      sessionStorage.setItem("barFrom", obj.name)
-    }
+      console.log(val,'修改后的oyStallCode')     
+      sessionStorage.setItem('oyStallCode',val)    
+        let obj = this.list.find(function (obj) {
+          return obj.oyStallCode == val
+        })
+        console.log(obj,'obj')     
+        sessionStorage.setItem("barName", obj.name)
+      }
   }
 };
 </script>

wx_application/src/views/counter/counterEdit.vue

@@ -114,6 +114,8 @@ export default {
             // size: 3,
             action: "http://139.155.48.151:8084/admin/auth/util/saveImg",
             response: res => {
+              console.log(res.data.imgPath,'富文本');
+              
               return res.data.imgPath;
             },
             headers: xhr => {

wx_application/src/views/counter/counterInfo.vue

@@ -38,14 +38,15 @@ export default {
       oyStallCode: '',
       storeInfo: {
         logo: './img/counter.png',
-        name: 'only专柜',
-        summaryTitle: 'ONLY是丹麦著名的国际时装公司BESTSELLER拥有的众多著名品牌之一',       
+        name: '未配置',
+        summaryTitle: '未配置',       
       },
       carousel:['./img/cswiper.png','./img/cswiper.png','./img/cswiper.png','./img/cswiper.png']
     }
   },
   mounted() { 
     this.oyStallCode = sessionStorage.getItem('oyStallCode') 
+    console.log(sessionStorage.getItem('oyStallCode'),'专柜code1');
     this.getAgentAuth()
     this.getDetail()
   },
@@ -54,10 +55,12 @@ export default {
       let params = {
         oyStallCode: this.oyStallCode
       }
+      console.log(this.oyStallCode,'专柜code2');
+      
       getStoreDetail(params).then(res => {
         if(res.data.stallInfo != null) {
           this.info = 2
-          console.log(res,'res');
+          console.log(res,'专柜信息');
           this.carousel = res.data.carousel
           this.storeInfo = res.data.stallInfo
         }else {

wx_application/src/views/mainSale/active/main/index.vue

@@ -115,6 +115,7 @@ import axios from "axios";
 import { getStoreDetail } from "@/api/sidebar/voucher";
 import { configWx, getUserInfo } from "@/utils/aCommon";
 import { getUserInfoByUserId } from "@/api/sidebar/voucher";
+import { log } from 'util';
 export default {
   name: "discountIndex",
   data() {
@@ -130,7 +131,7 @@ export default {
           bk_logoUrl: "https://ezhq.xyz/img/main/logo_sona.jpg",
           logoUrl: "/photo.png",
           barFrom: "alice",
-          barName: "only",
+          barName: "未配置",
           icon: {
             "1": "/mainSale/icon-arrow-right-light.png"
           }
@@ -207,7 +208,9 @@ export default {
     };
   },
   created() {
-    this.checkNowMenuBar()  
+
+    this.checkNowMenuBar() 
+    // this.getNewFans() 
     if(sessionStorage.getItem('userId')) {
       if(sessionStorage.getItem('avatar')) {
         console.log(sessionStorage.getItem('avatar'),'已有头像')
@@ -218,7 +221,7 @@ export default {
         this.test.barInfo.personalFans = sessionStorage.getItem('personalFan')
       }
       if(sessionStorage.getItem('barName')) {
-        this.test.manInfo.barFrom = sessionStorage.getItem('barName')
+        this.test.manInfo.barName = sessionStorage.getItem('barName')
         console.log(sessionStorage.getItem('barName'),'已有专柜名称')     
       }
     }else  {
@@ -272,6 +275,57 @@ export default {
           console.log(err);
         });
     },
+    getAllFans() {
+      let headerData = {
+        agentId: "1000033",
+        corpId: "ww4df265003b43fa0d"
+      };
+
+      axios({
+        url:
+          "http://139.155.48.151:8085/workWx/auth/contact/listExternalContacts?userId=" +
+          this.zcache.userId,
+        method: "get",
+        headers: headerData
+      })
+        .then(res => {
+          this.test.barInfo.personalFans = res.data.data.length
+          sessionStorage.setItem("personalFan",  res.data.data.length)
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+    // getNewFans() { 
+    //   //  let headerData = {
+    //   //   agentId: "1000033",
+    //   //   corpId: "ww4df265003b43fa0d"
+    //   // };
+    //   let JsonStr = {}
+    //   JsonStr.userid = ['shanDian']
+    //   let timeNow = Date.parse(new Date())
+    //   JsonStr.start_time = timeNow-24*60*60*1000
+    //   JsonStr.end_time = timeNow
+    //   console.log(JsonStr,'obj')     
+    //    axios({
+    //      url: "http://139.155.48.151:8085/workWx/auth/contact/getUserBehaviorData",
+    //      method: "post",
+    //      headers: {
+    //        'Content-Type': 'application/json',
+    //        'agentId': "1000033",
+    //        'corpId': "ww4df265003b43fa0d"
+    //      },
+         
+    //      data:JSON.stringify(JsonStr)
+    //    })
+    //      .then(res => {
+    //        console.log(res,'res')
+           
+    //      })
+    //      .catch(err => {
+    //        console.log(err)
+    //      })
+    // },
     // 获取店铺信息
     getStore() {
       let params = {
@@ -400,6 +454,7 @@ export default {
           this.zcache.userId = String(res.data.data.userId);
           this.getUserFromId(this.zcache.userId);
           this.getUserInfo();
+          this.getNewFans()
         })
         .catch(err => {
           console.log(err);

ybf_admin/src/pages/in/contact/components/addGroup.vue

@@ -212,10 +212,14 @@ export default {
       let data = Object.assign(this.addForm,{ clerkIds })
       delete data.clerkId
       addGroup(data).then(res => {
-        console.log(res)
+        if(res.data.isSuccessful == 0) {
+          this.$message.fail(res.data.msg)
+        }else{
+          this.$emit("handleAddFinish")
+        }
       })
       // console.log(addGroup)
-      this.$emit("handleAddFinish")
+      
     },
     // 获取所有人员
     getGroupMember(id) {

ybf_admin/src/pages/in/contact/components/editGroup.vue

 <template>
   <div class="ct">
     <el-dialog
-      title="创建子部门"
+      title="编辑子部门"
       :visible.sync="editDialog"
       width="58%"
       :show-close="false"
@@ -186,14 +186,14 @@ export default {
           this.detail = 1
         }
         const clerkId = []
-        const deptId = ''
-        this.deptId = res.data.supervisors[0].departmentId
         res.data.supervisors.forEach(item => {
           clerkId.push(item.id)          
         })
         this.$set(this.addForm,'clerkId',clerkId)
         this.addForm.clerkId = clerkId
         this.getDeptList()
+        const deptId = ''
+        this.deptId = res.data.supervisors[0].departmentId
         this.getGroupMember(this.deptId)   
       })
     },    

ybf_admin/src/pages/in/contact/mail.vue

@@ -37,7 +37,7 @@
       <div class="line lines">
         <div >
           <el-button class="button button_group" size="small" @click="addChild">添加子部门</el-button>
-          <el-button class="button button_group" size="small" @click="editChild">编辑部门</el-button>
+          <el-button class="button buttondark" :disabled="groupId ? false : true" size="small" @click="editChild">编辑部门</el-button>
           <el-button class="button buttondark" :disabled="groupId ? false : true" size="small" @click="deleteChild">删除部门</el-button
           >
         </div>

ybf_wx/public/qrCode/index.html

@@ -232,7 +232,6 @@
             success: function (res) {
                 // alert(`--->qrCode: ajax: res.`)
                 // alert(`--->qrCode: ajax: res: res =${JSON.stringify(res)}`)
-                console.log(res)
                 $('#image').attr('src', res.data)
                 // $('#image').attr('src', 'http://qywx2.100smartdata.com/qrCode/1584512690487.jpeg')
             },

ybf_wx/public/register/index.html

@@ -70,6 +70,21 @@
             showQRInfo()
         });
         const showQRInfo = () => {
+
+        function onBridgeReady() {
+            WeixinJSBridge.call('hideOptionMenu');
+        }
+        if (typeof WeixinJSBridge == "undefined") {
+            if (document.addEventListener) {
+                document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+            } else if (document.attachEvent) {
+                document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+                document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+            }
+
+        } else {
+            onBridgeReady()
+        }   
             // let pageUri = `${nowUrl}&detailid=${voucherId}&actionid=${activeId}&unionid=${unionId}`;
             // let storecode = "181"
             let pageUri = `pages/user/register/register?storeCode=${storecode}`

ybf_wx/src/views/qrCode/index.vue

@@ -41,33 +41,6 @@ export default {
         _this.createCode();
       });
     },
-    // createCode() {
-    //   let _this = this;
-    //   let pageUrl = `/wxx/cgi-bin/wxaapp/createwxaqrcode?access_token=${_this.accessToken}`;
-    //   $.ajax({
-    //     type: "POST",
-    //     url: pageUrl,
-    //     data: JSON.stringify({ path: "pages/signIn/signIn" }),
-    //     // data: JSON.stringify({ path: `${_this.nowUrl}&detailid=${_this.voucherId}&actionid=${_this.activeId}&unionid=${_this.unionId}` }),
-    //     xhrFields: { responseType: "arraybuffer" },
-    //     success: function(res) {
-    //       alert('success' + JSON.stringify(res))
-    //       let imgUrl =
-    //         "data:image/png;base64," +
-    //         btoa(
-    //           new Uint8Array(res).reduce(
-    //             (data, byte) => data + String.fromCharCode(byte),
-    //             ""
-    //           )
-    //         );
-    //       $("#image").attr("src", imgUrl);
-    //     },
-    //     error: function(data) {
-    //       alert('error' + JSON.stringify(data))
-    //       console.log(data);
-    //     }
-    //   });
-    // },
     createCode() {
       let _this = this;
       let nowUrl = _this.nowUrl? _this.nowUrl : ""