开始中央化的数据迁移

ghsApp/src/admin/home/login.vue

@@ -129,7 +129,7 @@ export default {
 							return false
 						}
 						uni.setStorageSync('token', subRes.data.token)
-						uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+						uni.setStorageSync('shopId', subRes.data.admin.currentGhsShopId)
 						getDictionaries({ token: subRes.data.token }).then(res => {
 							if (that.$util.isEmpty(res)) {
 								return false
@@ -200,7 +200,7 @@ export default {
 										return false
 									}
 									uni.setStorageSync('token', subRes.data.token)
-									uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+									uni.setStorageSync('shopId', subRes.data.admin.currentGhsShopId)
 									getDictionaries({ token: subRes.data.token }).then(res => {
 										if (that.$util.isEmpty(res)) {
 											return false
@@ -278,7 +278,7 @@ export default {
 						return false
 					}
 					uni.setStorageSync('token', subRes.data.token)
-					uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+					uni.setStorageSync('shopId', subRes.data.admin.currentGhsShopId)
 					getDictionaries({ token: subRes.data.token }).then(res => {
 						if (that.$util.isEmpty(res)) {
 							return false

ghsApp/src/admin/home/me.vue

@@ -12,12 +12,12 @@
           <view class="me-shop_top">
             <view class="shop-top_left">
 
-              <image :src="shopInfo.shopImg" style="width:110upx;border-radius:100upx;" mode="widthFix" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
+              <image :src="shopInfo.shopImg" style="width:110upx;border-radius:100upx;" mode="widthFix" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
               </image>
               <image :src="shopInfo.shopImg" style="width:110upx;border-radius:100upx;" mode="widthFix" @click="pageTo({url:'/admin/home/login'})" v-else>
               </image>
 
-              <view class="top-info_box" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
+              <view class="top-info_box" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
                 <view> {{ shopInfo.shopName||'' }} </view>
                 <view> <text>{{ shopInfo.sjName||'' }} | SID {{shopInfo.shopId||''}}</text> </view>
               </view>
@@ -44,63 +44,66 @@
           <view class="input-line-wrap">
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/changeShop' })" class="line-cell" :hover="false" :arrow="true" v-if="shopInfo.adminId == 2 || shopInfo.adminId == 4 || shopInfo.adminId == 497" >
-              <div class="tui-title">切换门店</div>
+              <view class="tui-title">切换门店</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shopYeChange/list' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">余额明细</div>
+              <view class="tui-title">余额明细</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/income' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">收入明细</div>
+              <view class="tui-title">收入明细</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expend' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">支出明细</div>
+              <view class="tui-title">支出明细</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/withdraw' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">提现记录</div>
+              <view class="tui-title">提现记录</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/rechargeList' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">充值记录</div>
+              <view class="tui-title">充值记录</view>
             </tui-list-cell>
 
             <!-- <tui-list-cell @click="pageTo({ url: '/admin/tools/blue' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">蓝牙管理</div>
+              <view class="tui-title">蓝牙管理</view>
             </tui-list-cell> -->
 
             <tui-list-cell @click="pageTo({ url: '/admin/book/index' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">使用教程</div>
+              <view class="tui-title">使用教程</view>
             </tui-list-cell>
 
             <!-- #ifdef APP-PLUS -->
-			      <!-- #endif -->            
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/cashSet' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">提现账号</div>
+              <view class="tui-title">提现账号</view>
             </tui-list-cell>
+            <!-- #endif -->
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/password' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">密码修改</div>
+              <view class="tui-title">密码修改</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">打印机设置</div>
+              <view class="tui-title">打印机设置</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/trumpet' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">云喇叭设置</div>
+              <view class="tui-title">云喇叭设置</view>
             </tui-list-cell>
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expressSet' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">快递设置</div>
+              <view class="tui-title">快递设置</view>
+            </tui-list-cell>
+            <tui-list-cell @click="pageTo({ url: '/admin/shop/sk' })" class="line-cell" :hover="false" :arrow="true">
+              <view class="tui-title">绑定零售门店</view>
             </tui-list-cell>
             <!-- #ifdef APP-PLUS -->
-            <tui-list-cell @click="closeApp()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
-              <div class="tui-title">关闭APP</div>
+            <tui-list-cell @click="closeApp()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
+              <view class="tui-title">关闭APP</view>
             </tui-list-cell>
-            <tui-list-cell @click="loginOut()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
-              <div class="tui-title">退出登陆</div>
+            <tui-list-cell @click="loginOut()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentGhsShopId > 0">
+              <view class="tui-title">退出登陆</view>
             </tui-list-cell>
             <!-- #endif -->
           </view>

ghsApp/src/admin/shop/sk.vue

@@ -17,7 +17,7 @@
 </template>
 <script>
 import TuiListCell from "@/components/plugin/list-cell";
-import { skCustom,skCustomSet } from "@/api/shop";
+import { skCustom,bindLsShop } from "@/api/shop";
 export default {
   name: "sk",
   components: {TuiListCell},
@@ -58,27 +58,26 @@ export default {
         that.$msg('请选择门店')
         return false
       }
-      skCustomSet({id:that.form.customId}).then(res=>{
-          if(res.code == 1){
-            that.$msg(res.msg)
-            setTimeout(function(){
-
-              // let pages = getCurrentPages()
-              // let prevPage = pages[ pages.length - 2 ]
-              // prevPage.$vm.skCustomId = that.form.customId
-              // uni.navigateBack({})
-
-              that.$store.commit("setLoginInfo", {})
-              that.$util.pageTo({url: "/admin/home/workbench",type: 3})
-
-            },1000)
+      uni.showModal({
+        title: '提示',
+        content: '确认绑定？',
+        success: function (res) {
+          if (res.confirm) {
+            bindLsShop({id:that.form.customId}).then(res=>{
+                if(res.code == 1){
+                  that.$msg(res.msg)
+                  setTimeout(function(){
+                    uni.navigateBack()
+                  },2000)
+                }
+            })
           }
+        }
       })
     }
   },
 };
 </script>
-
 <style lang="scss" scoped>
 .app-content {
   min-height: calc(100vh - 20upx);

ghsApp/src/api/shop/index.js

@@ -1,4 +1,9 @@
 import https from '@/plugins/luch-request_0.0.7/request'
+
+export const bindLsShop = data => {
+	return https.get('/shop/bind-ls-shop', data)
+}
+
 /** *
  * 门店列表
  */

ghsApp/src/components/not-login.vue

@@ -18,14 +18,14 @@ export default {
 	watch: {
 		getLoginInfo: {
 			handler(newValue) {
-        if(this.$util.isEmpty(newValue.admin) == false && newValue.admin.currentShopId > 0){
+        if(this.$util.isEmpty(newValue.admin) == false && newValue.admin.currentGhsShopId > 0){
           this.showModel = false
         }				
 			}
 		}
 	},
 	mounted() {
-    if(this.$util.isEmpty(this.getLoginInfo.admin) || this.getLoginInfo.admin.currentShopId == 0){
+    if(this.$util.isEmpty(this.getLoginInfo.admin) || this.getLoginInfo.admin.currentGhsShopId == 0){
       this.showModel = true
     }
 	},

ghsApp/src/config.js

@@ -1,3 +1,3 @@
 export const ProjectName = 'store'
-export const APIHOST = 'https://api.shop.hzghd.com'
-export const IMGHOST = 'https://img.hzghd.com'
+export const APIHOST = 'http://api.shop.hzghd.com'
+export const IMGHOST = 'http://img.hzghd.com'

ghsApp/src/mixins/globalMixins.js

@@ -176,7 +176,7 @@ export default {
           return false
         }
         uni.setStorageSync('token', subRes.data.token)
-        uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+        uni.setStorageSync('shopId', subRes.data.admin.currentGhsShopId)
         getDictionaries({ token: subRes.data.token }).then(res => {
           if (this.$util.isEmpty(res)) {
             return false

ghsApp/src/utils/auth.js

@@ -83,7 +83,7 @@ export async function wxMiniLogin(update) {
 					}
 
 					uni.setStorageSync('token', subRes.data.token)
-					uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+					uni.setStorageSync('shopId', subRes.data.admin.currentGhsShopId)
 					getDictionaries({ token: subRes.data.token }).then(res => {
 						if (util.isEmpty(res)) {
 							return false

hdApp/src/admin/home/login.vue

@@ -107,7 +107,7 @@ export default {
 							return false
 						}
 						uni.setStorageSync('token', subRes.data.token)
-						uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+						uni.setStorageSync('shopId', subRes.data.admin.currentHdShopId)
 						getDictionaries({ token: subRes.data.token }).then(res => {
 							if (that.$util.isEmpty(res)) {
 								return false
@@ -172,7 +172,7 @@ export default {
 										return false
 									}
 									uni.setStorageSync('token', subRes.data.token)
-									uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+									uni.setStorageSync('shopId', subRes.data.admin.currentHdShopId)
 									getDictionaries({ token: subRes.data.token }).then(res => {
 										if (that.$util.isEmpty(res)) {
 											return false
@@ -245,7 +245,7 @@ export default {
 						return false
 					}
 					uni.setStorageSync('token', subRes.data.token)
-					uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+					uni.setStorageSync('shopId', subRes.data.admin.currentHdShopId)
 					getDictionaries({ token: subRes.data.token }).then(res => {
 						if (that.$util.isEmpty(res)) {
 							return false

hdApp/src/admin/home/me.vue

@@ -12,12 +12,12 @@
           <view class="me-shop_top">
             <view class="shop-top_left">
 
-              <image :src="shopInfo.shopImg" style="width:110upx;border-radius:100upx;" mode="widthFix" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
+              <image :src="shopInfo.shopImg" style="width:110upx;border-radius:100upx;" mode="widthFix" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentHdShopId > 0">
               </image>
               <image :src="shopInfo.shopImg" style="width:110upx;border-radius:100upx;" mode="widthFix" @click="pageTo({url:'/admin/home/login'})" v-else>
               </image>
 
-              <view class="top-info_box" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
+              <view class="top-info_box" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentHdShopId > 0">
                 <view> {{ shopInfo.shopName||'' }} </view>
                 <view><text>{{ shopInfo.sjName||'' }} | SID {{shopInfo.shopId||''}}</text></view>
               </view>
@@ -29,9 +29,7 @@
             </view>
             <button @click="shopShow" v-if="loginInfo.switchShop" class="admin-button-com default chang-shop_btn" > <i class="iconfont iconqiehuan1"></i>切换门店</button>
           </view>
-          <view @click=" pageTo({ url: '/pagesClient/official/renewal' }) " class="image-box" >
-            <image :src="`${constant.imgUrl}/ghs/me/upgrade.png`"></image>
-          </view>
+          <view @click=" pageTo({ url: '/pagesClient/official/renewal' }) " class="image-box" > <image :src="`${constant.imgUrl}/ghs/me/upgrade2.png`"></image> </view>
         </view>
         <view class="account-info_box content_box">
           <view class="info-lf_box">
@@ -44,61 +42,61 @@
           <view class="input-line-wrap">
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/shopYeChange' })" class="line-cell" :hover="false" :arrow="true" >
-                <div class="tui-title">余额明细</div>
+                <view class="tui-title">余额明细</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/withdraw' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">提现记录</div>
+              <view class="tui-title">提现记录</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/income' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">收入明细</div>
+              <view class="tui-title">收入明细</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expend' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">支出明细</div>
+              <view class="tui-title">支出明细</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/coupon/couponList' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">我的红包</div>
+              <view class="tui-title">我的红包</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/rechargeList' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">充值记录</div>
+              <view class="tui-title">充值记录</view>
             </tui-list-cell>
 
             <!-- #ifdef APP-PLUS -->
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/cashSet' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">提现帐号</div>
+              <view class="tui-title">提现帐号</view>
             </tui-list-cell>
             <!-- #endif -->
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/password' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">密码修改</div>
+              <view class="tui-title">密码修改</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/pagesStore/me/expressSet' })" class="line-cell" :hover="false" :arrow="true" >
-              <div class="tui-title">快递设置</div>
+              <view class="tui-title">快递设置</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/shop/print' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">云打印</div>
+              <view class="tui-title">云打印</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/jc/index' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">新手教程</div>
+              <view class="tui-title">新手教程</view>
             </tui-list-cell>
 
             <tui-list-cell @click="pageTo({ url: '/admin/staff/miniAutoLogin' })" class="line-cell" :hover="false" :arrow="true">
-              <div class="tui-title">帐号绑定</div>
+              <view class="tui-title">帐号绑定</view>
             </tui-list-cell>
 
             <!-- #ifdef APP-PLUS -->
-            <tui-list-cell @click="closeApp()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
-              <div class="tui-title">关闭APP</div>
+            <tui-list-cell @click="closeApp()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentHdShopId > 0">
+              <view class="tui-title">关闭APP</view>
             </tui-list-cell>
-            <tui-list-cell @click="loginOut()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">
-              <div class="tui-title">退出登陆</div>
+            <tui-list-cell @click="loginOut()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentHdShopId > 0">
+              <view class="tui-title">退出登陆</view>
             </tui-list-cell>
             <!-- #endif -->
 

hdApp/src/components/not-login.vue

@@ -18,14 +18,14 @@ export default {
 	watch: {
 		getLoginInfo: {
 			handler(newValue) {
-        if(this.$util.isEmpty(newValue.admin) == false && newValue.admin.currentShopId > 0){
+        if(this.$util.isEmpty(newValue.admin) == false && newValue.admin.currentHdShopId > 0){
           this.showModel = false
         }				
 			}
 		}
 	},
 	mounted() {
-    if(this.$util.isEmpty(this.getLoginInfo.admin) || this.getLoginInfo.admin.currentShopId == 0){
+    if(this.$util.isEmpty(this.getLoginInfo.admin) || this.getLoginInfo.admin.currentHdShopId == 0){
       this.showModel = true
     }
 	},

hdApp/src/config.js

@@ -1,3 +1,3 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
+export const APIHOST = 'http://api.shop.huaml.com'
+export const IMGHOST = 'http://img.huaml.com'

hdApp/src/mixins/globalMixins.js

@@ -60,7 +60,7 @@ export default {
 				hasTokenAutoLogin().then(subRes=>{
 				  //有几个地方涉及登陆，需要统一方法，请搜索关键词 uni_login
 				  if(subRes.code == 1){
-					uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+					uni.setStorageSync('shopId', subRes.data.admin.currentHdShopId)
 					getDictionaries({ token: subRes.data.token }).then(res => {
 						if (that.$util.isEmpty(res)) {
 							return false

hdApp/src/pagesClient/official/apply.vue

@@ -292,7 +292,7 @@ export default {
             return false
           }
           uni.setStorageSync('token', subRes.data.token)
-          uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+          uni.setStorageSync('shopId', subRes.data.admin.currentHdShopId)
           getDictionaries({ token: subRes.data.token }).then(res => {
             if (that.$util.isEmpty(res)) {
               return false

hdApp/src/utils/auth.js

@@ -84,7 +84,7 @@ export async function wxLoginFn(update) {
 						return false
 					}
 					uni.setStorageSync('token', subRes.data.token)
-					uni.setStorageSync('shopId', subRes.data.admin.currentShopId)
+					uni.setStorageSync('shopId', subRes.data.admin.currentHdShopId)
 					getDictionaries({ token: subRes.data.token }).then(res => {
 						if (util.isEmpty(res)) {
 							return false