1 год назад · 3b962cc2de
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,7 @@
 
				     <meta name="referrer" content="no-referrer">
			
 
				     <meta name="viewport" content="width=device-width,initial-scale=1.0">
			
 
				     <link rel="icon" href="<%= BASE_URL %>favicon.png">
			
 
				-    <title><%= htmlWebpackPlugin.options.title %></title>
			
 
				+    <title>分销商城</title>
			
 
				   </head>
			
 
				   <body>
			
 
				     <!--<script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js"></script>-->
			
--- a/src/api/institutionApi/order.js
+++ b/src/api/institutionApi/order.js
@@ -60,6 +60,7 @@ export const updatedInsertVoucher = (data) => http({
 
				   data,
			
 
				   headers: {
			
 
				     isToken: true
			
 
				+    // 'Content-Type': 'application/json'
			
 
				   }
			
 
				 })
			
 
				 
			
--- a/src/api/userApi/order-sale.js
+++ b/src/api/userApi/order-sale.js
@@ -18,10 +18,10 @@ export const orderSaleDetail = params => http({
 
				   }
			
 
				 })
			
 
				 
			
 
				-export const orderSaleSettle = params => http({
			
 
				+export const orderSaleSettle = data => http({
			
 
				   url: '/commodity/reportingClub/updateSplitSettleStatus',
			
 
				-  method: 'GET',
			
 
				-  params,
			
 
				+  method: 'POST',
			
 
				+  data,
			
 
				   headers: {
			
 
				     isToken: true
			
 
				   }
			
--- a/src/assets/Wecha.png
+++ b/src/assets/Wecha.png
--- a/src/components/OrderTypeList.vue
+++ b/src/components/OrderTypeList.vue
@@ -8,7 +8,7 @@
 
				         :icon="item.icon"

			
 
				         v-for="item,index in ObjCell.list"

			
 
				         :key="index"

			
 
				-        :to="item.to"

			
 
				+        @click="handlerLink(item.to)"

			
 
				       />

			
 
				     </van-cell-group>

			
 
				     <div class="content">

			
@@ -28,6 +28,11 @@ export default {
 
				         isInset: ''

			
 
				       })

			
 
				     }

			
 
				+  },

			
 
				+  methods: {

			
 
				+    handlerLink (e) {

			
 
				+      window.location.href = e

			
 
				+    }

			
 
				   }

			
 
				 }

			
 
				 </script>

			
--- a/src/components/poster.vue
+++ b/src/components/poster.vue
@@ -2,7 +2,7 @@
 
				   <div class="poster">
			
 
				     <van-overlay :show="show" @click="show = false, showPoster = false" class="overlay">
			
 
				       <div class="wrapper">
			
 
				-        <img v-if="link" :src="link" style="width: 71vw;
			
 
				+        <img v-if="link" :src="link" style="width: 72vw;
			
 
				         height: 128vw;
			
 
				         margin-top: 10vw;" alt="">
			
 
				       </div>
			
@@ -12,7 +12,7 @@
 
				       <div class="poster-img">
			
 
				         <div class="title">
			
 
				           <div class="title-image">
			
 
				-            <img src="" width="100%" height="100%" />
			
 
				+            <img :src="proImg" width="100%" height="100%" />
			
 
				             <div class="text">
			
 
				               <div class="name">{{ dataInfo.name }}</div>
			
 
				               <distri-logo :codeText="codeText"/>
			
@@ -66,7 +66,7 @@
 
				                 <div class="qrcode-message">
			
 
				                   <img :src="qrImg || ''" class="qrcode" mode=""/>
			
 
				                 </div>
			
 
				-                <div class="tips">长按或扫二维码<br />联系我</div>
			
 
				+                <div class="tips"><span>长按或扫二维码</span><br />联系我</div>
			
 
				               </div>
			
 
				             </div>
			
 
				           </div>
			
@@ -198,7 +198,7 @@ export default {
 
				   left: -9999px;
			
 
				   top: -9999px;
			
 
				   margin-top: 10vw;
			
 
				-  width: 71vw;
			
 
				+  width: 72vw;
			
 
				   height: 127vw;
			
 
				   padding: 2vw;
			
 
				   box-sizing: border-box;
			
@@ -320,6 +320,9 @@ export default {
 
				             text-align: center;
			
 
				             width: 11.2vw;
			
 
				             line-height: 2.1vw;
			
 
				+            span {
			
 
				+              white-space: nowrap;
			
 
				+            }
			
 
				           }
			
 
				         }
			
 
				       }
			
--- a/src/components/sales-card-list.vue
+++ b/src/components/sales-card-list.vue
@@ -1,23 +1,23 @@
 
				 <template>

			
 
				   <div class="card-list">

			
 
				     <van-checkbox-group v-model="result" ref="checkboxGroup">

			
 
				-      <div class="card_item">

			
 
				-        <van-checkbox shape="square" checked-color="#FF5B00" v-if="isChecked" />

			
 
				+      <div class="card_item" v-for="info in tabListInfo" :key="info.id" >

			
 
				+        <van-checkbox shape="square" checked-color="#FF5B00" :name="info.cmReportingClub.id" v-if="isChecked" />

			
 
				         <div class="item">

			
 
				-          <div class="label">下单编号：<span>{{tabListInfo.shopOrderNo}}</span></div>

			
 
				-          <div class="label">佣金：<span>{{tabListInfo.commission}}</span></div>

			
 
				-          <div class="label">下单时间：<span>{{tabListInfo.endTime}}</span></div>

			
 
				-          <div class="label">结算时间：<span>{{tabListInfo.endTime}}</span></div>

			
 
				+          <div class="label">下单编号：<span>{{info.cmReportingClub.shopOrderNo}}</span></div>

			
 
				+          <div class="label">佣金：<span>{{info.splitCommission.toFixed(2)}}</span></div>

			
 
				+          <div class="label">下单时间：<span>{{info.createTime}}</span></div>

			
 
				+          <div class="label" v-if="isSettle">结算时间：<span>{{info.settleTime}}</span></div>

			
 
				         </div>

			
 
				       </div>

			
 
				-      <div class="conter-btn" v-if="isChecked">

			
 
				-        <div class="selct_all">

			
 
				-          <van-checkbox class="all" v-model="allSelect" shape="square" checked-color="#FF5B00" v-if="isChecked" />

			
 
				-          全选

			
 
				-        </div>

			
 
				-        <van-button color="#FF5B00" @click="handlerSelect">确认</van-button>

			
 
				-      </div>

			
 
				     </van-checkbox-group>

			
 
				+    <div class="conter-btn" v-if="isChecked">

			
 
				+      <div class="selct_all">

			
 
				+        <van-checkbox class="all" v-model="allSelect" shape="square" checked-color="#FF5B00" v-if="isChecked" />

			
 
				+        全选

			
 
				+      </div>

			
 
				+      <van-button color="#FF5B00" @click="handlerSelect">确认</van-button>

			
 
				+    </div>

			
 
				   </div>

			
 
				 </template>

			
 
				 

			
@@ -25,18 +25,22 @@
 
				 export default {

			
 
				   props: {

			
 
				     tabListInfo: {

			
 
				-      type: Object,

			
 
				-      default: () => ({})

			
 
				+      type: Array,

			
 
				+      default: () => ([])

			
 
				     },

			
 
				     isChecked: {

			
 
				       type: Boolean,

			
 
				       default: () => true

			
 
				+    },

			
 
				+    isSettle: {

			
 
				+      type: Boolean,

			
 
				+      default: () => true

			
 
				     }

			
 
				   },

			
 
				   data () {

			
 
				     return {

			
 
				       result: [],

			
 
				-      allSelect: true

			
 
				+      allSelect: false

			
 
				     }

			
 
				   },

			
 
				   watch: {

			
@@ -46,10 +50,24 @@ export default {
 
				       } else {

			
 
				         this.$refs.checkboxGroup.toggleAll()

			
 
				       }

			
 
				+    },

			
 
				+    result (val) {

			
 
				+      if (val) {

			
 
				+        this.allSelect = this.getInclude3(this.tabListInfo.map(e => e.id), val)

			
 
				+      }

			
 
				     }

			
 
				   },

			
 
				   methods: {

			
 
				+    getInclude3 (arr1, arr2) {

			
 
				+      const temp = []

			
 
				+      for (const item of arr2) {

			
 
				+        // eslint-disable-next-line no-unused-expressions

			
 
				+        arr1.includes(item) ? temp.push(item) : ''

			
 
				+      }

			
 
				+      return !!temp.length

			
 
				+    },

			
 
				     handlerSelect () {

			
 
				+      console.log(this.result)

			
 
				       this.$emit('handlerSelect', this.result)

			
 
				     }

			
 
				   }

			
@@ -58,12 +76,12 @@ export default {
 
				 

			
 
				 <style lang="scss" scoped>

			
 
				 .card-list {

			
 
				-  background: #fff;

			
 
				-  padding: 5.3vw 5vw;

			
 
				-

			
 
				   .card_item {

			
 
				+    background: #fff;

			
 
				     display: flex;

			
 
				     align-items: flex-start;

			
 
				+    margin-bottom: 3vw;

			
 
				+    padding: 5.3vw 5vw;

			
 
				 

			
 
				     .item {

			
 
				       display: flex;

			
--- a/src/permission.js
+++ b/src/permission.js
@@ -2,15 +2,29 @@ import router from './router'
 
				 import NProgress from 'nprogress'

			
 
				 import store from './store'

			
 
				 import 'nprogress/nprogress.css'

			
 
				-import {

			
 
				-  getToken

			
 
				-} from '@/util/auth'

			
 
				+import { getToken } from '@/util/auth'

			
 
				 

			
 
				 NProgress.configure({

			
 
				   showSpinner: false

			
 
				 })

			
 
				 

			
 
				-const whiteList = ['/login', '/pwlogin', '/forgotPW', '/goods-detail', '/order-list', '/share', '/order-detail', '/order-pay', '/paymentOnline', '/paymentOffline', '/wechatpay', '/intention-confirm', '/upload-voucher', '/orderLogistics']

			
 
				+const whiteList = [

			
 
				+  '/login',

			
 
				+  '/pwlogin',

			
 
				+  '/forgotPW',

			
 
				+  '/goods-detail',

			
 
				+  '/order-list',

			
 
				+  '/share',

			
 
				+  '/order-detail',

			
 
				+  '/order-pay',

			
 
				+  '/paymentOnline',

			
 
				+  '/paymentOffline',

			
 
				+  '/wechatpay',

			
 
				+  '/intention-confirm',

			
 
				+  '/upload-voucher',

			
 
				+  '/orderLogistics',

			
 
				+  '/ins-intention-detail'

			
 
				+]

			
 
				 

			
 
				 router.beforeEach((to, from, next) => {

			
 
				   NProgress.start()

			
@@ -26,18 +40,21 @@ router.beforeEach((to, from, next) => {
 
				       NProgress.done()

			
 
				     } else {

			
 
				       if (!store.getters.userInfo) {

			
 
				-        store.dispatch('user/getUserInfo', store.getters.userId).then(() => {

			
 
				-          store.dispatch('institution/addressList').then(() => {

			
 
				-            next()

			
 
				+        store

			
 
				+          .dispatch('user/getUserInfo', store.getters.userId)

			
 
				+          .then(() => {

			
 
				+            store.dispatch('institution/addressList').then(() => {

			
 
				+              next()

			
 
				+            })

			
 
				           })

			
 
				-        }).catch(err => {

			
 
				-          console.log(err)

			
 
				-          store.dispatch('user/loginOut').then(() => {

			
 
				-            next({

			
 
				-              path: '/pwlogin'

			
 
				+          .catch((err) => {

			
 
				+            console.log(err)

			
 
				+            store.dispatch('user/loginOut').then(() => {

			
 
				+              next({

			
 
				+                path: '/pwlogin'

			
 
				+              })

			
 
				             })

			
 
				           })

			
 
				-        })

			
 
				       } else {

			
 
				         next()

			
 
				       }

			
--- a/src/plugin/jsSdk.js
+++ b/src/plugin/jsSdk.js
@@ -17,12 +17,12 @@ Vue.prototype.$wxReady = async (callback, shareUrl) => {
 
				     if (!wx) return
			
 
				     // const signature = SHA1(`jsapi_ticket=${res.ticket}&noncestr=${nonceStr}&timestamp=${timestamp}&url=${encodeURIComponent(url)}`).toString()
			
 
				     wx.config({
			
 
				-      debug: dev === 'development', //  开启调试模式,调用的所有 api 的返回值会在客户端 alert 出来，若要查看传入的参数，可以在 pc 端打开，参数信息会通过 log 打出，仅在 pc 端时才会打印。
			
 
				+      debug: dev === 'development', // dev === 'development' 开启调试模式,调用的所有 api 的返回值会在客户端 alert 出来，若要查看传入的参数，可以在 pc 端打开，参数信息会通过 log 打出，仅在 pc 端时才会打印。
			
 
				       appId: 'wx91c4152b60ca91a3', // 必填，公众号的唯一标识
			
 
				       timestamp: res.timestamp, // 必填，生成签名的时间戳
			
 
				       nonceStr: res.noncestr, // 必填，生成签名的随机串
			
 
				       signature: res.signature, // 必填，签名
			
 
				-      jsApiList: ['updateAppMessageShareData', 'updateTimelineShareData', 'onMenuShareAppMessage'] // 必填，需要使用的 JS 接口列表
			
 
				+      jsApiList: ['updateAppMessageShareData', 'onMenuShareAppMessage'] // 必填，需要使用的 JS 接口列表
			
 
				     })
			
 
				     wx.ready(callback(wx))
			
 
				     wx.error(function (error) {
			
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -180,7 +180,7 @@ const routes = [
 
				     name: 'ins-intention-detail',

			
 
				     component: () => import('@/views/ins-intention-report/detail.vue'),

			
 
				     meta: {

			
 
				-      title: '详情'

			
 
				+      title: '意向报备详情'

			
 
				     }

			
 
				   },

			
 
				   {

			
--- a/src/store/user.js
+++ b/src/store/user.js
@@ -1,86 +1,92 @@
 
				-// 用户 store
			
 
				-import { login, getUserInfo, codeLogin } from '@/api/userApi/login'
			
 
				-import { setToken, removeToken } from '@/util/auth'
			
 
				-
			
 
				-const state = () => ({
			
 
				-  USERTOKEN: null,
			
 
				-  isFindCard: false,
			
 
				-  userId: null,
			
 
				-  manage: null,
			
 
				-  userInfo: null,
			
 
				-  isManage: false
			
 
				-})
			
 
				-
			
 
				-const mutations = {
			
 
				-  SET_TOKEN: (state, k) => {
			
 
				-    state.USERTOKEN = k
			
 
				-  },
			
 
				-  SET_USERID: (state, k) => {
			
 
				-    state.userId = k
			
 
				-  },
			
 
				-  SET_USERINFO: (state, k) => {
			
 
				-    state.userInfo = k
			
 
				-  },
			
 
				-  SET_MANAGE: (state, k) => {
			
 
				-    state.manage = k
			
 
				-  },
			
 
				-  SET_IS_MANAGE: (state, k) => {
			
 
				-    state.isManage = k
			
 
				-  }
			
 
				-}
			
 
				-
			
 
				-const actions = {
			
 
				-  userLogin: ({ commit }, userInfo) => {
			
 
				-    return new Promise((resolve, reject) => {
			
 
				-      login(userInfo).then(res => {
			
 
				-        setToken(res.token)
			
 
				-        commit('SET_USERID', res.userId)
			
 
				-        commit('SET_TOKEN', res.token)
			
 
				-        console.log('登录成功', res)
			
 
				-        resolve(res)
			
 
				-      }).catch(err => {
			
 
				-        reject(err)
			
 
				-      })
			
 
				-    })
			
 
				-  },
			
 
				-  codeLogin: ({ commit }, userInfo) => {
			
 
				-    return new Promise((resolve, reject) => {
			
 
				-      codeLogin(userInfo).then(res => {
			
 
				-        setToken(res.token)
			
 
				-        commit('SET_USERID', res.userId)
			
 
				-        commit('SET_TOKEN', res.token)
			
 
				-        console.log('登录成功', res)
			
 
				-        resolve(res)
			
 
				-      }).catch(err => {
			
 
				-        reject(err)
			
 
				-      })
			
 
				-    })
			
 
				-  },
			
 
				-  getUserInfo: ({ commit }, data) => {
			
 
				-    return new Promise((resolve, reject) => {
			
 
				-      console.log(data)
			
 
				-      getUserInfo({ userId: data }).then(res => {
			
 
				-        commit('SET_USERINFO', res)
			
 
				-        commit('SET_IS_MANAGE', res.parentId === 0)
			
 
				-        console.log('用户信息', res)
			
 
				-        resolve(res)
			
 
				-      }).catch(err => {
			
 
				-        reject(err)
			
 
				-      })
			
 
				-    })
			
 
				-  },
			
 
				-  loginOut: ({ commit }) => {
			
 
				-    return new Promise((resolve, reject) => {
			
 
				-      commit('SET_TOKEN', '')
			
 
				-      removeToken()
			
 
				-      resolve(resolve)
			
 
				-    })
			
 
				-  }
			
 
				-}
			
 
				-
			
 
				-export default {
			
 
				-  namespaced: true,
			
 
				-  state,
			
 
				-  mutations,
			
 
				-  actions
			
 
				-}
			
 
				+// 用户 store

			
 
				+import { login, getUserInfo, codeLogin } from '@/api/userApi/login'

			
 
				+import { setToken, removeToken } from '@/util/auth'

			
 
				+

			
 
				+const state = () => ({

			
 
				+  USERTOKEN: null,

			
 
				+  isFindCard: false,

			
 
				+  userId: null,

			
 
				+  manage: null,

			
 
				+  userInfo: null,

			
 
				+  isManage: false

			
 
				+})

			
 
				+

			
 
				+const mutations = {

			
 
				+  SET_TOKEN: (state, k) => {

			
 
				+    state.USERTOKEN = k

			
 
				+  },

			
 
				+  SET_USERID: (state, k) => {

			
 
				+    state.userId = k

			
 
				+  },

			
 
				+  SET_USERINFO: (state, k) => {

			
 
				+    state.userInfo = k

			
 
				+  },

			
 
				+  SET_MANAGE: (state, k) => {

			
 
				+    state.manage = k

			
 
				+  },

			
 
				+  SET_IS_MANAGE: (state, k) => {

			
 
				+    state.isManage = k

			
 
				+  }

			
 
				+}

			
 
				+

			
 
				+const actions = {

			
 
				+  userLogin: ({ commit }, userInfo) => {

			
 
				+    return new Promise((resolve, reject) => {

			
 
				+      login(userInfo).then(res => {

			
 
				+        setToken(res.token)

			
 
				+        commit('SET_USERID', res.userId)

			
 
				+        commit('SET_TOKEN', res.token)

			
 
				+        console.log('登录成功', res)

			
 
				+        resolve(res)

			
 
				+      }).catch(err => {

			
 
				+        reject(err)

			
 
				+      })

			
 
				+    })

			
 
				+  },

			
 
				+  codeLogin: ({ commit }, userInfo) => {

			
 
				+    return new Promise((resolve, reject) => {

			
 
				+      codeLogin(userInfo).then(res => {

			
 
				+        setToken(res.token)

			
 
				+        commit('SET_USERID', res.userId)

			
 
				+        commit('SET_TOKEN', res.token)

			
 
				+        console.log('登录成功', res)

			
 
				+        resolve(res)

			
 
				+      }).catch(err => {

			
 
				+        reject(err)

			
 
				+      })

			
 
				+    })

			
 
				+  },

			
 
				+  getUserInfo: ({ commit }, data) => {

			
 
				+    return new Promise((resolve, reject) => {

			
 
				+      console.log(data)

			
 
				+      getUserInfo({ userId: data }).then(res => {

			
 
				+        commit('SET_USERINFO', res)

			
 
				+        commit('SET_IS_MANAGE', res.parentId === 0)

			
 
				+        console.log('用户信息', res)

			
 
				+        resolve(res)

			
 
				+      }).catch(err => {

			
 
				+        reject(err)

			
 
				+      })

			
 
				+    })

			
 
				+  },

			
 
				+  setUserInfo: ({ commit }, data) => {

			
 
				+    return new Promise((resolve, reject) => {

			
 
				+      console.log(data)

			
 
				+      commit('SET_USERINFO', { id: 114514 })

			
 
				+    })

			
 
				+  },

			
 
				+  loginOut: ({ commit }) => {

			
 
				+    return new Promise((resolve, reject) => {

			
 
				+      commit('SET_TOKEN', '')

			
 
				+      removeToken()

			
 
				+      resolve(resolve)

			
 
				+    })

			
 
				+  }

			
 
				+}

			
 
				+

			
 
				+export default {

			
 
				+  namespaced: true,

			
 
				+  state,

			
 
				+  mutations,

			
 
				+  actions

			
 
				+}

			
--- a/src/views/ins-intention-report/add.vue
+++ b/src/views/ins-intention-report/add.vue
@@ -41,17 +41,18 @@
 
				     </van-dialog>
			
 
				     <!--<report-tips :show="showTips" @tipsHidden="tipsHidden"></report-tips>-->
			
 
				     <report-select-popup ref="select-popup" @handlerSelect="handlerSelect"></report-select-popup>
			
 
				+    <report-tips :show="showTips" @tipsHidden="tipsHidden"></report-tips>
			
 
				   </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				 import { insIntentionReportAdd } from '../../api/userApi/ins-intention-report'
			
 
				 import ReportSelectPopup from './components/report-select-popup.vue'
			
 
				-// import ReportTips from './components/report-tips.vue'
			
 
				+import ReportTips from './components/report-tips.vue'
			
 
				 import { uploadImage } from '@/api/userApi/mine-card.js'
			
 
				 export default {
			
 
				   components: {
			
 
				-    // ReportTips,
			
 
				+    ReportTips,
			
 
				     ReportSelectPopup
			
 
				   },
			
 
				   data () {
			
--- a/src/views/ins-intention-report/components/report-tips.vue
+++ b/src/views/ins-intention-report/components/report-tips.vue
@@ -47,6 +47,7 @@ export default {
 
				   width: 100%;
			
 
				   top: 0;
			
 
				   left: 0;
			
 
				+  height: 100%;
			
 
				   background: rgba($color: #000000, $alpha: 0.8);
			
 
				 }
			
 
				 .tips {
			
--- a/src/views/ins-intention-report/detail.vue
+++ b/src/views/ins-intention-report/detail.vue
@@ -72,10 +72,14 @@ export default {
 
				         : this.isAudit * 1 === 2
			
 
				           ? '审核通过'
			
 
				           : '审核失败'
			
 
				+    },
			
 
				+    reference () {
			
 
				+      return this.$route.query.reference * 1
			
 
				     }
			
 
				   },
			
 
				-  mounted () {
			
 
				-    this.insIntentionReportDetail()
			
 
				+  async mounted () {
			
 
				+    await this.insIntentionReportDetail()
			
 
				+    this.initAppMessageShareData()
			
 
				   },
			
 
				   methods: {
			
 
				     async insIntentionReportDetail () {
			
@@ -96,14 +100,14 @@ export default {
 
				         wx.onMenuShareAppMessage({
			
 
				           title: '意向确认', // 分享标题
			
 
				           desc: '意向确认', // 分享描述
			
 
				-          link: `${process.env.VUE_APP_DATA_API}intention-confirm?id=${this.resultInfo.cmReportingClub.id}&userInfo=${JSON.stringify({ img: this.$store.getters.userInfo.image, linkMan: this.$store.getters.userInfo.linkMan })}`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				+          link: `${process.env.VUE_APP_DATA_API}intention-confirm?i=${this.resultInfo.cmReportingClub.id}&d=${this.$store.getters.userInfo.id}`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				           imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`, // 分享图标
			
 
				           type: 'link',
			
 
				-          success: () => {
			
 
				-            alert('onMenuShareAppMessage: 设置成功')
			
 
				-          },
			
 
				+          success: () => {},
			
 
				           fail: () => {
			
 
				-            alert('onMenuShareAppMessage: 设置失败')
			
 
				+            if (process.env.NODE_ENV === 'production') {
			
 
				+              window.location.reload()
			
 
				+            }
			
 
				           }
			
 
				         })
			
 
				       })
			
--- a/src/views/ins-intention-report/index.vue
+++ b/src/views/ins-intention-report/index.vue
@@ -26,9 +26,6 @@
 
				               <van-button @click="handlerPlaceOrder(item.cmReportingClub)">下单</van-button>
			
 
				               <van-button @click="handlerDetail(item)">查看详情</van-button>
			
 
				             </div>
			
 
				-            <!--<div class="detail-btn" v-if="isReportAuditStatus(item.auditStatus) && isReportLock(data.lockStatus)">
			
 
				-              <van-button @click="handlerDetail(item)">查看详情</van-button>
			
 
				-            </div>-->
			
 
				             <div class="detail-btn" v-else>
			
 
				               <van-button @click="handlerDetail(item)">查看详情</van-button>
			
 
				             </div>
			
@@ -46,17 +43,15 @@
 
				         >去报备</van-button
			
 
				       >
			
 
				     </div>
			
 
				-    <report-tips :show="showTips" @tipsHidden="tipsHidden"></report-tips>
			
 
				   </div>
			
 
				 </template>
			
 
				 
			
 
				 <script>
			
 
				 import { insIntentionReportList } from '../../api/userApi/ins-intention-report'
			
 
				 import reportStatus from './mixins/index'
			
 
				-import ReportTips from './components/report-tips'
			
 
				 import SearchHead from './components/search-head'
			
 
				 export default {
			
 
				-  components: { SearchHead, ReportTips },
			
 
				+  components: { SearchHead },
			
 
				   mixins: [reportStatus],
			
 
				   data () {
			
 
				     return {
			
@@ -78,6 +73,7 @@ export default {
 
				   },
			
 
				   mounted () {
			
 
				     this.getInsIntentionReportList(this.active)
			
 
				+    this.initAppMessageShareData()
			
 
				   },
			
 
				   methods: {
			
 
				     tipsHidden (val) {
			
@@ -98,7 +94,7 @@ export default {
 
				       this.getInsIntentionReportList(this.active)
			
 
				     },
			
 
				     handlerDetail ($event) {
			
 
				-      this.$ApiRouter(`/ins-intention-detail?id=${$event.id}`)
			
 
				+      window.location.href = `/ins-intention-detail?id=${$event.id}&reference=1`
			
 
				     },
			
 
				     handlerPlaceOrder ($event) {
			
 
				       window.location.href = `/goods-detail?productId=${$event.productId}&typeId=0&isLock=1&cId=${$event.id}`
			
@@ -112,6 +108,25 @@ export default {
 
				       const { results: data, hasNextPage } = await insIntentionReportList(form)
			
 
				       this.hasNextPage = hasNextPage
			
 
				       this.dataList = [...data]
			
 
				+    },
			
 
				+    // 分享当前页面
			
 
				+    initAppMessageShareData () {
			
 
				+      this.$wxReady((wx) => {
			
 
				+        // 需在用户可能点击分享按钮前就先调用
			
 
				+        wx.updateAppMessageShareData({
			
 
				+          title: '分销商城', // 分享标题
			
 
				+          desc: '分销商城', // 分享描述
			
 
				+          link: `${process.env.VUE_APP_DATA_API}intention-confirm?id=${this.resultInfo.cmReportingClub.id}&image=${this.$store.getters.userInfo.image}&linkMan=${this.$store.getters.userInfo.linkMan}&distributionId=${this.$store.getters.userInfo.id}`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				+          imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`,
			
 
				+          success: () => {
			
 
				+          },
			
 
				+          fail: () => {
			
 
				+            if (process.env.NODE_ENV === 'production') {
			
 
				+              window.location.reload()
			
 
				+            }
			
 
				+          }
			
 
				+        })
			
 
				+      })
			
 
				     }
			
 
				   }
			
 
				 }
			
@@ -121,6 +136,7 @@ export default {
 
				 .ins-report {
			
 
				   padding-bottom: 17.3vw;
			
 
				   min-height: 100vh;
			
 
				+  position: relative;
			
 
				 }
			
 
				 .report-list {
			
 
				   padding: 2.4vw;
			
--- a/src/views/ins-intention-report/intention-confirm.vue
+++ b/src/views/ins-intention-report/intention-confirm.vue
@@ -3,7 +3,7 @@
 
				     <!--<nav-bar title="采购意向确认" @click-left="$router.back()" />-->
			
 
				     <div class="container">
			
 
				       <div class="user-img">
			
 
				-        <van-image :src="userInfo.img || 'https://static.caimei365.com/app/mini-distribution/default.png'"></van-image>
			
 
				+        <van-image :src="userInfo.image || 'https://static.caimei365.com/app/mini-distribution/default.png'"></van-image>
			
 
				       </div>
			
 
				       <div class="name">{{ userInfo.linkMan }}</div>
			
 
				       <div class="pro-name"></div>
			
@@ -22,44 +22,49 @@
 
				 <script>
			
 
				 import { insIntentionReportDetail, insIntentionReportUpdated } from '@/api/userApi/ins-intention-report'
			
 
				 import { Toast } from 'vant'
			
 
				+import { getUserInfo } from '@/api/userApi/login'
			
 
				 export default {
			
 
				   data () {
			
 
				     return {
			
 
				-      resultInfo: {}
			
 
				+      resultInfo: {},
			
 
				+      userInfo: {}
			
 
				     }
			
 
				   },
			
 
				   computed: {
			
 
				     id () {
			
 
				-      return this.$route.query.id
			
 
				+      return this.$route.query.i
			
 
				     },
			
 
				-    userInfo () {
			
 
				-      return JSON.parse(this.$route.query.userInfo)
			
 
				+    distributionId () {
			
 
				+      return this.$route.query.d
			
 
				     }
			
 
				   },
			
 
				   mounted () {
			
 
				     this.insIntentionReportDetail()
			
 
				-    console.log(this.userInfo)
			
 
				+    this.getUserInfo()
			
 
				   },
			
 
				   methods: {
			
 
				     async insIntentionReportDetail () {
			
 
				       const data = await insIntentionReportDetail({ id: this.id })
			
 
				       this.resultInfo = data
			
 
				     },
			
 
				+    async getUserInfo () {
			
 
				+      const data = await getUserInfo({ id: this.distributionId })
			
 
				+      this.userInfo = data
			
 
				+    },
			
 
				     async insIntentionReportUpdated () {
			
 
				       try {
			
 
				-        await insIntentionReportUpdated({ id: this.id, distributionId: this.resultInfo.distributionId })
			
 
				-        Toast.success('操作成功')
			
 
				-        setTimeout(function () {
			
 
				-          WeixinJSBridge.call('closeWindow')
			
 
				-        }, 1000)
			
 
				+        await insIntentionReportUpdated({ id: this.id, distributionId: this.distributionId })
			
 
				+        this.handlerNot()
			
 
				       } catch (error) {
			
 
				         console.log(error)
			
 
				       }
			
 
				     },
			
 
				     handlerNot () {
			
 
				       Toast.success('操作成功')
			
 
				-      setTimeout(function () {
			
 
				-        WeixinJSBridge.call('closeWindow')
			
 
				+      setTimeout(() => {
			
 
				+        if (typeof WeixinJSBridge !== 'undefined') {
			
 
				+          WeixinJSBridge.call('closeWindow')
			
 
				+        }
			
 
				       }, 1000)
			
 
				     }
			
 
				   }
			
--- a/src/views/mine/index.vue
+++ b/src/views/mine/index.vue
@@ -150,7 +150,7 @@ export default {
 
				   },

			
 
				   methods: {

			
 
				     handlerLink ($event) {

			
 
				-      this.$ApiRouter(`${$event.link}`)

			
 
				+      window.location.href = $event.link

			
 
				     }

			
 
				   }

			
 
				 }

			
--- a/src/views/order-list/address-edit.vue
+++ b/src/views/order-list/address-edit.vue
@@ -27,19 +27,6 @@
 
				         <van-button @click="onDelete">删除</van-button>
			
 
				       </div>
			
 
				     </div>
			
 
				-    <!--<van-address-edit
			
 
				-      show-delete
			
 
				-      :show-area="false"
			
 
				-      :show-detail="false"
			
 
				-      :show-set-default="true"
			
 
				-      @save="onSave"
			
 
				-      @delete="onDelete"
			
 
				-      @change-detail="onChangeDetail"
			
 
				-      :address-info="formData"
			
 
				-    >
			
 
				-      <template #default>
			
 
				-      </template>
			
 
				-    </van-address-edit>-->
			
 
				     <van-popup v-model="showPicker" round position="bottom">
			
 
				       <van-picker
			
 
				         show-toolbar
			
@@ -95,7 +82,7 @@ export default {
 
				       }
			
 
				       const data = await addressSave(form)
			
 
				       console.log(data)
			
 
				-      this.$router.push('/address-select')
			
 
				+      this.$router.back()
			
 
				     },
			
 
				     async onDelete () {
			
 
				       try {
			
--- a/src/views/order-list/components/order-btn-type.vue
+++ b/src/views/order-list/components/order-btn-type.vue
@@ -227,6 +227,7 @@ export default {
 
				             this.$emit('orderConfirm')
			
 
				           })
			
 
				         })
			
 
				+        this.$store.dispatch('user/setUserInfo')
			
 
				         this.showConfirm = false
			
 
				       } catch (error) {
			
 
				         console.log(error)
			
--- a/src/views/order-list/index.vue
+++ b/src/views/order-list/index.vue
@@ -149,6 +149,7 @@ export default {
 
				     } else {
			
 
				       this.handlerManage(this.activeBtn)
			
 
				     }
			
 
				+    this.initAppMessageShareDataInit()
			
 
				   },
			
 
				   methods: {
			
 
				     async handlerManage (id) {
			
@@ -208,29 +209,37 @@ export default {
 
				     initAppMessageShareData (info) {
			
 
				       this.$wxReady((wx) => {
			
 
				         // 需在用户可能点击分享按钮前就先调用
			
 
				-        // wx.updateAppMessageShareData({
			
 
				-        //  title: '分享订单', // 分享标题
			
 
				-        //  desc: '分享订单', // 分享描述
			
 
				-        //  link: `https://sell-b.caimei365.com/share?type=2&shopOrderId=${info.shopOrderId}&userId=${info.userId}`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				-        //  imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`, // 分享图标
			
 
				-        //  fail: () => {
			
 
				-        //    alert('updateAppMessageShareData: 设置错误')
			
 
				-        //  },
			
 
				-        //  success: () => {
			
 
				-        //    alert('updateAppMessageShareData: 设置成功')
			
 
				-        //  }
			
 
				-        // })
			
 
				         wx.onMenuShareAppMessage({
			
 
				-          title: `${process.env.VUE_APP_DATA_API}share?type=2&shopOrderId=${info.shopOrderId}&userId=${info.userId}`, // 分享标题
			
 
				-          desc: `${process.env.VUE_APP_DATA_API}share?type=2&shopOrderId=${info.shopOrderId}&userId=${info.userId}`, // 分享描述
			
 
				+          title: '分享订单', // 分享标题
			
 
				+          desc: '订单列表', // 分享描述
			
 
				           link: `${process.env.VUE_APP_DATA_API}share?type=2&shopOrderId=${info.shopOrderId}&userId=${info.userId}&active=0`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				           imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`, // 分享图标
			
 
				           type: 'link',
			
 
				           success: () => {
			
 
				-            alert('onMenuShareAppMessage: 设置成功')
			
 
				           },
			
 
				           fail: () => {
			
 
				-            alert('onMenuShareAppMessage: 设置失败')
			
 
				+            if (process.env.NODE_ENV === 'production') {
			
 
				+              window.location.reload()
			
 
				+            }
			
 
				+          }
			
 
				+        })
			
 
				+      })
			
 
				+    },
			
 
				+    initAppMessageShareDataInit () {
			
 
				+      this.$wxReady((wx) => {
			
 
				+        // 需在用户可能点击分享按钮前就先调用
			
 
				+        wx.onMenuShareAppMessage({
			
 
				+          title: '分享订单', // 分享标题
			
 
				+          desc: '订单列表', // 分享描述
			
 
				+          link: window.location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				+          imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`, // 分享图标
			
 
				+          type: 'link',
			
 
				+          success: () => {
			
 
				+          },
			
 
				+          fail: () => {
			
 
				+            if (process.env.NODE_ENV === 'production') {
			
 
				+              window.location.reload()
			
 
				+            }
			
 
				           }
			
 
				         })
			
 
				       })
			
@@ -253,6 +262,9 @@ export default {
 
				   color: #ff5b00;
			
 
				   font-weight: 600;
			
 
				 }
			
 
				+.van-tabs {
			
 
				+  z-index: 99;
			
 
				+}
			
 
				 ::v-deep .van-tabs__line {
			
 
				   background: #ff5b00;
			
 
				 }
			
--- a/src/views/order-list/order-create.vue
+++ b/src/views/order-list/order-create.vue
@@ -37,6 +37,7 @@ import InvoiceInformation from './components/invoice-information'
 
				 import ContactSelect from './components/contact-select'
			
 
				 import { settlementOrder, submitGenerate } from '@/api/institutionApi/order'
			
 
				 import { orderAddress } from '@/api/institutionApi/address'
			
 
				+import { Toast } from 'vant'
			
 
				 export default {
			
 
				   components: {
			
 
				     FreightCell,
			
@@ -138,18 +139,19 @@ export default {
 
				         pageSize: 20
			
 
				       })
			
 
				       this.isAddress = list.length > 0
			
 
				-      this.addressInfo = list[0]
			
 
				-      this.formData.addressId = this.addressInfo.addressId
			
 
				+      this.addressInfo = list[0] || {}
			
 
				+      this.formData.addressId = this.addressInfo.addressId || 0
			
 
				       await this.settlementOrder({
			
 
				         userId: this.$store.getters.userId,
			
 
				         productCount: this.$route.query.selectedNum,
			
 
				         skuId: this.$route.query.selectedSku,
			
 
				-        cityId: this.addressInfo.cityId,
			
 
				+        cityId: this.addressInfo.cityId || '',
			
 
				         productId: this.$route.query.productId,
			
 
				         source: 1
			
 
				       })
			
 
				     },
			
 
				     async onOrderEvent () {
			
 
				+      if (this.formData.addressId === 0) return Toast.fail('请选择地址')
			
 
				       console.log(this.orderInfo)
			
 
				       console.log(this.orderInvoice)
			
 
				       console.log(this.payInfo)
			
--- a/src/views/order-list/order-detail.vue
+++ b/src/views/order-list/order-detail.vue
@@ -77,8 +77,8 @@
 
				         <div class="content" v-if="voucherList && voucherList.length > 0">
			
 
				           <div v-for="voucher in voucherList" :key="voucher.id">
			
 
				             <div class="time">{{voucher.addtime}}</div>
			
 
				-            <div class="images" v-for="i in voucher.imgs" :key="i.id">
			
 
				-              <van-image :src="i.img"></van-image>
			
 
				+            <div class="images">
			
 
				+              <van-image :src="i.img" v-for="i in voucher.imgs" :key="i.id"></van-image>
			
 
				             </div>
			
 
				             <div class="notes">备注：{{voucher.remarks}}</div>
			
 
				           </div>
			
@@ -187,6 +187,7 @@ export default {
 
				   },
			
 
				   mounted () {
			
 
				     this.orderDetail()
			
 
				+    this.initAppMessageShareData()
			
 
				   },
			
 
				   methods: {
			
 
				     async orderDetail () {
			
@@ -215,7 +216,7 @@ export default {
 
				       this.orderDetail()
			
 
				     },
			
 
				     // 分享当前页面
			
 
				-    initAppMessageShareData (info) {
			
 
				+    initAppMessageShareData () {
			
 
				       this.$wxReady((wx) => {
			
 
				         // 需在用户可能点击分享按钮前就先调用
			
 
				         wx.onMenuShareAppMessage({
			
@@ -225,16 +226,16 @@ export default {
 
				           imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`, // 分享图标
			
 
				           type: 'link',
			
 
				           success: () => {
			
 
				-            alert('onMenuShareAppMessage: 设置成功')
			
 
				           },
			
 
				           fail: () => {
			
 
				-            alert('onMenuShareAppMessage: 设置失败')
			
 
				+            if (process.env.NODE_ENV === 'production') {
			
 
				+              window.location.reload()
			
 
				+            }
			
 
				           }
			
 
				         })
			
 
				       })
			
 
				     },
			
 
				     shareOrder (info) {
			
 
				-      this.initAppMessageShareData(info)
			
 
				       setTimeout(() => {
			
 
				         Toast.success('请点击右上角...进行分享')
			
 
				       }, 1000)
			
@@ -303,6 +304,7 @@ export default {
 
				   .notes {
			
 
				     font-size: 3.5vw;
			
 
				     color: #666;
			
 
				+    margin-bottom: 4vw;
			
 
				   }
			
 
				   .images {
			
 
				     display: flex;
			
--- a/src/views/order-list/order-upload-voucher.vue
+++ b/src/views/order-list/order-upload-voucher.vue
@@ -52,6 +52,7 @@ export default {
 
				       this.formData.voucherImgs.push(data)
			
 
				     },
			
 
				     async updatedInsertVoucher () {
			
 
				+      this.formData.voucherImgs = this.formData.voucherImgs.join('##')
			
 
				       try {
			
 
				         await updatedInsertVoucher(Object.assign(this.formData, { shopOrderId: this.shopOrderId }))
			
 
				         this.$router.back()
			
--- a/src/views/order-report/detail.vue
+++ b/src/views/order-report/detail.vue
@@ -1,7 +1,7 @@
 
				 <template>
			
 
				   <div class="report-detail">
			
 
				     <div style="position: sticky;top: 0;z-index: 999;">
			
 
				-      <nav-bar title="订单报备佣金详情" @click-left="$router.back()"/>
			
 
				+      <nav-bar title="订单报备佣金详情" @click-left="$router.push(`/order-report?status=${settleStatus}`)"/>
			
 
				       <div class="report-card">
			
 
				         <div class="card-item">
			
 
				           <div>成员姓名：<span>{{ form.name }}</span></div>
			
@@ -13,11 +13,11 @@
 
				           <div>订单数量：<span>{{ form.orderCount }}</span></div>
			
 
				         </div>
			
 
				         <div class="card-item">
			
 
				-          <div>佣金：<span>{{ form.commission }}</span></div>
			
 
				+          <div>佣金：<span>{{ form.commission.toFixed(2) }}</span></div>
			
 
				         </div>
			
 
				       </div>
			
 
				       <van-form @submit="searchNum">
			
 
				-         <van-field placeholder="请输入订单编号" v-model="formData.shopOrderNo"/>
			
 
				+         <van-field placeholder="请输入机构名称" v-model="formData.clubName"/>
			
 
				          <div class="search-btn">
			
 
				           <van-button color="#FF5B00" native-type="submit">搜索</van-button>
			
 
				          </div>
			
@@ -32,10 +32,10 @@
 
				               <div>￥{{ i.commission.toFixed(2) }}</div>
			
 
				             </div>
			
 
				           </div>
			
 
				-          <div class="foot">
			
 
				+          <div class="foot" v-if="settleStatus === 3">
			
 
				             <div class="time">
			
 
				               <div>结算时间：</div>
			
 
				-              <div>{{ i.createTime }}</div>
			
 
				+              <div>{{ data.orderTime }}</div>
			
 
				             </div>
			
 
				           </div>
			
 
				           <div class="compile" v-if="settleStatus === 1">
			
@@ -53,7 +53,7 @@ export default {
 
				   data () {
			
 
				     return {
			
 
				       formData: {
			
 
				-        shopOrderNo: ''
			
 
				+        clubName: ''
			
 
				       },
			
 
				       orderList: [],
			
 
				       form: {}
			
@@ -80,7 +80,7 @@ export default {
 
				       })
			
 
				     },
			
 
				     async orderReportDetail () {
			
 
				-      const data = await orderReportDetail({ id: this.id, settleStatus: this.settleStatus, shopOrderNo: this.formData.shopOrderNo })
			
 
				+      const data = await orderReportDetail({ id: this.id, settleStatus: this.settleStatus, clubName: this.formData.clubName })
			
 
				       this.form = data.cmDistribution
			
 
				       this.orderList = data.paginationVo.results
			
 
				     }
			
--- a/src/views/order-report/index.vue
+++ b/src/views/order-report/index.vue
@@ -1,7 +1,7 @@
 
				 <template>
			
 
				   <div class="order-report">
			
 
				     <div style="position: sticky;top: 0;z-index: 999;">
			
 
				-      <nav-bar title="订单报备佣金" @click-left="$router.back()" />
			
 
				+      <nav-bar title="订单报备佣金" @click-left="$router.push('/mine')" />
			
 
				       <van-tabs v-model="activeName">
			
 
				         <van-tab
			
 
				           :title="item.title"
			
@@ -31,7 +31,7 @@
 
				           <div>订单数量：<span>{{ i.orderCount }}</span></div>
			
 
				         </div>
			
 
				         <div class="card-item">
			
 
				-          <div>佣金：<span>{{ i.commission }}</span></div>
			
 
				+          <div>佣金：<span>{{ i.commission.toFixed(2) }}</span></div>
			
 
				         </div>
			
 
				         <i class="van-icon van-icon-arrow van-cell__right-icon"></i>
			
 
				       </div>
			
@@ -60,7 +60,6 @@ export default {
 
				           name: '3'
			
 
				         }
			
 
				       ],
			
 
				-      activeName: '2',
			
 
				       allSub: [
			
 
				         {
			
 
				           title: '订单数量',
			
@@ -76,7 +75,8 @@ export default {
 
				         mobile: '',
			
 
				         parentId: this.$store.getters.userInfo.id
			
 
				       },
			
 
				-      dataList: []
			
 
				+      dataList: [],
			
 
				+      activeName: '2'
			
 
				     }
			
 
				   },
			
 
				   watch: {
			
@@ -84,7 +84,15 @@ export default {
 
				       this.orderReportList()
			
 
				     }
			
 
				   },
			
 
				+  computed: {
			
 
				+    status () {
			
 
				+      return this.$route.query.status
			
 
				+    }
			
 
				+  },
			
 
				   mounted () {
			
 
				+    if (this.status) {
			
 
				+      this.activeName = this.status
			
 
				+    }
			
 
				     this.orderReportList()
			
 
				   },
			
 
				   methods: {
			
@@ -96,7 +104,7 @@ export default {
 
				     async orderReportList () {
			
 
				       const data = await orderReportList(Object.assign(this.formData, { settleStatus: this.activeName }))
			
 
				       this.allSub[0].sum = data.orderCount
			
 
				-      this.allSub[1].sum = data.commission
			
 
				+      this.allSub[1].sum = data.commission.toFixed(2)
			
 
				       this.dataList = data.cmDistributionList
			
 
				     }
			
 
				   }
			
--- a/src/views/order-sales/detail.vue
+++ b/src/views/order-sales/detail.vue
@@ -1,7 +1,7 @@
 
				 <template>
			
 
				   <div class="report-detail">
			
 
				     <div style="position: sticky; top: 0; z-index: 999">
			
 
				-      <nav-bar title="订单销售佣金详情" @click-left="$router.back()" />
			
 
				+      <nav-bar title="订单销售佣金详情" @click-left="$router.push(`/order-sales?status=${status}&payWay=${payWay}`)" />
			
 
				       <div class="report-card">
			
 
				         <div class="card-item">
			
 
				           <div>成员姓名：<span>{{ distributionInfo.linkMan }}</span></div>
			
@@ -13,7 +13,7 @@
 
				           <div>订单数量：<span>{{ distributionInfo.orderCount }}</span></div>
			
 
				         </div>
			
 
				         <div class="card-item">
			
 
				-          <div>佣金：<span>{{ distributionInfo.commission }}</span></div>
			
 
				+          <div>佣金：<span>{{ distributionInfo.commission.toFixed(2) }}</span></div>
			
 
				         </div>
			
 
				       </div>
			
 
				       <van-form @submit="searchNum">
			
@@ -43,7 +43,7 @@
 
				       <div class="line"></div>
			
 
				     </div>
			
 
				     <div style="padding-bottom: 20vw;">
			
 
				-      <sales-card-list v-for="item in dataList" :key="item.id" :isChecked="isChecked" :tabListInfo="item" @handlerSelect="handlerSelect"/>
			
 
				+      <sales-card-list :isChecked="isChecked" :isSettle="isSettle" :tabListInfo="dataList" @handlerSelect="handlerSelect"/>
			
 
				     </div>
			
 
				     <van-popup v-model="showStartPicker" position="bottom">
			
 
				       <van-datetime-picker
			
@@ -99,6 +99,9 @@ export default {
 
				     isChecked () {
			
 
				       return this.status * 1 === 0
			
 
				     },
			
 
				+    isSettle () {
			
 
				+      return this.status * 1 === 3
			
 
				+    },
			
 
				     id () {
			
 
				       return this.$route.query.id
			
 
				     },
			
@@ -114,14 +117,14 @@ export default {
 
				       const year = time.getFullYear()
			
 
				       const month = time.getMonth() + 1
			
 
				       const day = time.getDate()
			
 
				-      return year + '年' + month + '月' + day + '日'
			
 
				+      return year + '-' + (month < 10 ? '0' + month : month) + '-' + (day < 10 ? '0' + day : day)
			
 
				     },
			
 
				     searchNum () {
			
 
				       this.orderSaleDetail()
			
 
				     },
			
 
				     onConfirm ($event, type) {
			
 
				       if (type === 1) {
			
 
				-        this.formData.starTime = this.formatter($event)
			
 
				+        this.formData.startTime = this.formatter($event)
			
 
				       } else {
			
 
				         this.formData.endTime = this.formatter($event)
			
 
				       }
			
@@ -134,9 +137,9 @@ export default {
 
				       this.dataList = data.paginationVo.results
			
 
				     },
			
 
				     async handlerSelect ($event) {
			
 
				-      console.log($event)
			
 
				+      const data = $event.trim()
			
 
				       try {
			
 
				-        await orderSaleSettle({ ids: $event.map(e => e.id) })
			
 
				+        await orderSaleSettle({ ids: data })
			
 
				         this.orderSaleDetail()
			
 
				       } catch (error) {
			
 
				         console.log(error)
			
--- a/src/views/order-sales/index.vue
+++ b/src/views/order-sales/index.vue
@@ -1,7 +1,7 @@
 
				 <template>
			
 
				   <div>
			
 
				     <div style="position:sticky;top: 0;z-index: 999;">
			
 
				-      <nav-bar title="订单销售佣金" @click-left="$router.back()"/>
			
 
				+      <nav-bar title="订单销售佣金" @click-left="$router.push('/mine')"/>
			
 
				       <van-tabs v-model="formData.payWay" @click="orderSaleList()">
			
 
				         <van-tab v-for="item in tabList" :key="item.id" :title="item.title" :name="item.name"/>
			
 
				       </van-tabs>
			
@@ -28,7 +28,7 @@
 
				           <div>订单数量：<span>{{ item.orderCount }}</span></div>
			
 
				         </div>
			
 
				         <div class="card-item">
			
 
				-          <div>佣金：<span>{{ item.commission }}</span></div>
			
 
				+          <div>佣金：<span>{{ item.commission.toFixed(2) }}</span></div>
			
 
				         </div>
			
 
				         <i class="van-icon van-icon-arrow van-cell__right-icon"></i>
			
 
				       </div>
			
@@ -80,16 +80,20 @@ export default {
 
				           sum: 3000
			
 
				         }
			
 
				       ],
			
 
				-      formData: {
			
 
				-        splitSettleStatus: '2',
			
 
				+      dataList: []
			
 
				+    }
			
 
				+  },
			
 
				+  computed: {
			
 
				+    formData () {
			
 
				+      return {
			
 
				+        splitSettleStatus: (this.$route.query.status * 1 || this.$route.query.status * 1 === 0) ? this.$route.query.status.toString() : '2',
			
 
				         linkMan: '',
			
 
				         mobile: '',
			
 
				         pageSize: 10,
			
 
				         pageNum: 1,
			
 
				-        payWay: '1',
			
 
				+        payWay: (this.$route.query.payWay * 1 || this.$route.query.payWay * 1 === 0) ? this.$route.query.payWay.toString() : '1',
			
 
				         parentId: this.$store.getters.userInfo.id
			
 
				-      },
			
 
				-      dataList: []
			
 
				+      }
			
 
				     }
			
 
				   },
			
 
				   mounted () {
			
@@ -108,7 +112,7 @@ export default {
 
				     async orderSaleList () {
			
 
				       const data = await orderSaleList(this.formData)
			
 
				       this.allSub[0].sum = data.orderCount
			
 
				-      this.allSub[1].sum = data.commission
			
 
				+      this.allSub[1].sum = data.commission.toFixed(2)
			
 
				       this.dataList = data.cmDistributionList
			
 
				     },
			
 
				     handlerDetail (item) {
			
--- a/src/views/pay/mixins/pay.js
+++ b/src/views/pay/mixins/pay.js
@@ -14,7 +14,8 @@ export default {
 
				       const orderInfo = {
			
 
				         isShow: 1,
			
 
				         shopOrderId: this.$route.query.shopOrderId,
			
 
				-        payAmount: this.$route.query.payAmount
			
 
				+        payAmount: this.$route.query.payAmount,
			
 
				+        userId: this.$route.query.userId
			
 
				       }
			
 
				       location.href = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${encodeURIComponent(`${process.env.VUE_APP_DATA_API}wechatpay`)}&response_type=code&scope=snsapi_base&state=${JSON.stringify(orderInfo)}#wechat_redirect`
			
 
				     },
			
@@ -28,6 +29,7 @@ export default {
 
				       this.payAmount = js.payAmount
			
 
				       this.shopOrderId = js.shopOrderId
			
 
				       this.wechatcode = this.$route.query.code
			
 
				+      this.userId = js.userId
			
 
				     },
			
 
				     random (min, max) {
			
 
				       return Math.floor(Math.random() * (max - min)) + min
			
@@ -61,16 +63,19 @@ export default {
 
				         console.log(res)
			
 
				         if (res.err_msg === 'get_brand_wcpay_request:ok') {
			
 
				           Toast.success('支付成功')
			
 
				+          setTimeout(() => {
			
 
				+            window.location.href = `/order-list?isIns=1&uId=${this.userId}`
			
 
				+          }, 2000)
			
 
				         } else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
			
 
				-          Toast.fail('用户取消支付,请重新扫码支付')
			
 
				-          setTimeout(function () {
			
 
				-            WeixinJSBridge.call('closeWindow')
			
 
				-          }, 3000)
			
 
				+          Toast.fail('用户取消支付,请支付')
			
 
				+          setTimeout(() => {
			
 
				+            window.location.href = `/order-list?isIns=1&uId=${this.userId}`
			
 
				+          }, 2000)
			
 
				         } else {
			
 
				           Toast.fail('支付失败,请重新扫码支付')
			
 
				-          setTimeout(function () {
			
 
				-            WeixinJSBridge.call('closeWindow')
			
 
				-          }, 3000)
			
 
				+          setTimeout(() => {
			
 
				+            window.location.href = `/order-list?isIns=1&uId=${this.userId}`
			
 
				+          }, 2000)
			
 
				         }
			
 
				       })
			
 
				     }
			
--- a/src/views/pay/paymentOffline.vue
+++ b/src/views/pay/paymentOffline.vue
@@ -6,15 +6,21 @@
 
				         <div class="label">待付金额：</div>
			
 
				         <div class="money">￥{{ totalAmount }}</div>
			
 
				       </div>
			
 
				-      <div class="info">
			
 
				+      <div class="info" v-if="bankInfo.bankName && bankInfo.bankAccount">
			
 
				         转账信息
			
 
				       </div>
			
 
				-      <div class="form">
			
 
				-        <div class="item">开户行：<span>{{ bankInfo.bankAccountName }}</span></div>
			
 
				+      <div class="form" v-if="bankInfo.bankName && bankInfo.bankAccount">
			
 
				+        <div class="item">开户行：<span>{{ bankInfo.bankName }}</span></div>
			
 
				         <div class="item">银行卡号：<span>{{ bankInfo.bankAccount }}</span></div>
			
 
				-        <div class="item">公司名称：<span>{{ bankInfo.name }}</span></div>
			
 
				+        <div class="item">公司名称：<span>{{ bankInfo.bankAccountName }}</span></div>
			
 
				       </div>
			
 
				-      <div class="tips">
			
 
				+      <div class="pay-qrCode" v-else>
			
 
				+        <img width="150" height="150" :src="require('@/assets/Wecha.png')" alt="">
			
 
				+        <div class="tips">
			
 
				+          请用微信扫码添加采美客服<br />客服会为您推荐最合适的线下转账方式
			
 
				+        </div>
			
 
				+      </div>
			
 
				+      <div class="tips" v-if="bankInfo.bankName && bankInfo.bankAccount">
			
 
				         请将订单款项转账至上述账号，转账完成后截图支付凭证，并
			
 
				 在订单页面上传支付凭证。
			
 
				       </div>
			
@@ -108,5 +114,10 @@ export default {
 
				     line-height: 5.6vw;
			
 
				   }
			
 
				 }
			
 
				-
			
 
				+.pay-qrCode {
			
 
				+  display: flex;
			
 
				+  justify-content: center;
			
 
				+  align-items: center;
			
 
				+  flex-direction: column;
			
 
				+}
			
 
				 </style>
			
--- a/src/views/pay/paymentOnline.vue
+++ b/src/views/pay/paymentOnline.vue
@@ -160,7 +160,7 @@ export default {
 
				           console.log(error)
			
 
				         }
			
 
				       } else if (this.radio === 1) {
			
 
				-        this.$router.push(`/wechatpay?shopOrderId=${this.shopOrderId}&payAmount=${this.totalAmount}`)
			
 
				+        this.$router.push(`/wechatpay?shopOrderId=${this.shopOrderId}&payAmount=${this.totalAmount}&userId=${this.shopOrder.userId}`)
			
 
				       } else {
			
 
				         try {
			
 
				           await bankQuickPay(this.quickForm)
			
--- a/src/views/pay/wechatPay.vue
+++ b/src/views/pay/wechatPay.vue
@@ -31,7 +31,8 @@ export default {
 
				       state: 0, // 随机数
			
 
				       isRequest: true,
			
 
				       paymentChannel: 'HLB',
			
 
				-      shopOrderId: ''
			
 
				+      shopOrderId: '',
			
 
				+      userId: ''
			
 
				     }
			
 
				   },
			
 
				   mounted () {
			
--- a/src/views/shopping-mall/components/goods-detail.vue
+++ b/src/views/shopping-mall/components/goods-detail.vue
@@ -42,7 +42,7 @@ export default {
 
				 }
			
 
				 </script>
			
 
				 
			
 
				-<style lang="scss" scoped>
			
 
				+<style lang="scss">
			
 
				 .goods-detail {
			
 
				   padding: 4vw 3.2vw;
			
 
				   box-sizing: border-box;
			
@@ -71,4 +71,10 @@ export default {
 
				     }
			
 
				   }
			
 
				 }
			
 
				+.image {
			
 
				+  img {
			
 
				+    width: 100% !important;
			
 
				+    object-fit: contain !important;
			
 
				+  }
			
 
				+}
			
 
				 </style>
			
--- a/src/views/shopping-mall/detail.vue
+++ b/src/views/shopping-mall/detail.vue
@@ -76,6 +76,7 @@ export default {
 
				         this.skus = data.skus
			
 
				         this.dataInfo.productImage = this.imageList[0]
			
 
				         this.dataInfo.name = this.productInfo.name
			
 
				+        this.isgoBy = this.productInfo.validFlag === 0
			
 
				       } catch (err) {
			
 
				         this.isgoBy = true
			
 
				       }
			
@@ -94,26 +95,13 @@ export default {
 
				     initAppMessageShareData () {
			
 
				       this.$wxReady((wx) => {
			
 
				         // 需在用户可能点击分享按钮前就先调用
			
 
				-        // wx.updateAppMessageShareData({
			
 
				-        //  title: '商品详情', // 分享标题
			
 
				-        //  desc: `${process.env.VUE_APP_DATA_API}goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`, // 分享描述
			
 
				-        //  link: `${process.env.VUE_APP_DATA_API}goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				-        //  imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`, // 分享图标
			
 
				-        //  fail: () => {
			
 
				-        //    alert('updateAppMessageShareData: 设置错误')
			
 
				-        //  },
			
 
				-        //  success: () => {
			
 
				-        //    alert('updateAppMessageShareData: 设置成功')
			
 
				-        //  }
			
 
				-        // }) // `https://sell-b.caimei365.com/goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`
			
 
				         wx.onMenuShareAppMessage({
			
 
				           title: '分销商城', // 分享标题
			
 
				           desc: '分销商城', // 分享描述
			
 
				-          link: `${process.env.VUE_APP_DATA_API}goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				+          link: `${process.env.VUE_APP_DATA_API}goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId || this.suid}&isIns=1`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				           imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`, // 分享图标
			
 
				           type: 'link',
			
 
				           success: () => {
			
 
				-            alert('onMenuShareAppMessage: 设置成功')
			
 
				           },
			
 
				           fail: () => {
			
 
				             if (process.env.NODE_ENV === 'production') {
			
--- a/src/views/shopping-mall/index.vue
+++ b/src/views/shopping-mall/index.vue
@@ -49,25 +49,18 @@ export default {
 
				       this.$wxReady((wx) => {
			
 
				         // 需在用户可能点击分享按钮前就先调用
			
 
				         wx.updateAppMessageShareData({
			
 
				-          title: `https://sell-b.caimei365.com/goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`, // 分享标题
			
 
				-          desc: `${process.env.VUE_APP_DATA_API}goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`, // 分享描述
			
 
				-          link: `${process.env.VUE_APP_DATA_API}goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				-          imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`
			
 
				+          title: '分销商城', // 分享标题
			
 
				+          desc: '分销商城', // 分享描述
			
 
				+          link: window.location.href, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				+          imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`,
			
 
				+          success: () => {
			
 
				+          },
			
 
				+          fail: () => {
			
 
				+            if (process.env.NODE_ENV === 'production') {
			
 
				+              window.location.reload()
			
 
				+            }
			
 
				+          }
			
 
				         }) // `https://sell-b.caimei365.com/goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`
			
 
				-        // wx.onMenuShareAppMessage({
			
 
				-        //  title: `https://sell-b.caimei365.com/goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`, // 分享标题
			
 
				-        //  desc: `https://sell-b.caimei365.com/goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`, // 分享描述
			
 
				-        //  link: `${process.env.VUE_APP_DATA_API}goods-detail?productId=${this.productId}&typeId=0&suid=${this.$store.getters.userId}&isIns=1`, // 分享链接，该链接域名或路径必须与当前页面对应的公众号 JS 安全域名一致
			
 
				-        //  imgUrl: `${process.env.VUE_APP_DATA_API}favicon.png`, // 分享图标
			
 
				-        //  type: 'link',
			
 
				-        //  success: () => {
			
 
				-        //    console.log('设置成功')
			
 
				-        //    alert('设置成功')
			
 
				-        //  },
			
 
				-        //  fail: () => {
			
 
				-        //    alert('设置失败')
			
 
				-        //  }
			
 
				-        // })
			
 
				       }, 'https://sell-b.caimei365.com/goods-detail?productId=1040&typeId=0&suid=666803&isIns=1')
			
 
				     }
			
 
				   }