app

ghsApp/src/admin/billing/toPay.vue

@@ -19,6 +19,9 @@
           <view class="call-one-btn">
               <button class="button-com default" @click="checkResult()">查询支付结果</button>
           </view>
+          <view style="margin-top:35upx;">
+              <button style="width:25vh;" @click="changePayWay(2)" class="admin-button-com big default">记欠款</button>
+          </view>
         </view>
         <view v-else>
           <view style="text-align:center;margin:10upx auto 10upx auto;">
@@ -29,13 +32,13 @@
               <button @click="changePayWay(2)" style="margin-left:40upx;" class="admin-button-com middle" :class="payWay == 2 ? 'blue' : 'default'">欠款</button>
           </view>
           <image mode="widthFix" style="width:350upx;margin:0 auto;" :src="payQrCodeUrl"></image>
-          <view style="margin-top:35upx;">
-              <button style="width:25vh;" @click="goBack()" class="admin-button-com big default">返回首页</button>
-          </view>
-          <view v-if="orderInfo.orderType == 1" style="color:#CCCCCC;margin-top:20upx;">15分钟后，订单将自动变成欠款单 <text @click="cancelOrder()" style="color:#666666;margin-left:10upx;text-decoration:underline;">取消订单</text></view>
-          <view v-else style="color:#CCCCCC;margin-top:20upx;">客户下单，15分钟后将自动取消</view>
           </view>
         </view>
+        <view style="margin-top:35upx;">
+            <button style="width:25vh;" @click="goBack()" class="admin-button-com big default">返回首页</button>
+        </view>
+        <view v-if="orderInfo.orderType == 1" style="color:#CCCCCC;margin-top:20upx;">15分钟后，订单将自动变成欠款单 <text @click="cancelOrder()" style="color:#666666;margin-left:10upx;text-decoration:underline;">取消订单</text></view>
+        <view v-else style="color:#CCCCCC;margin-top:20upx;">客户下单，15分钟后将自动取消</view>
       </view>
     </view>
   </view>
@@ -199,7 +202,14 @@ export default {
       position: absolute;
       top: 0;
       left: 0;
-      width: 100vw;
+      /* 手机mobile屏幕小于1000px */
+      @media screen and (max-width: 1100px) {
+        width: 100vw;
+      }
+      /* 收银台cashier屏幕大于1000px */
+      @media screen and (min-width:1100px) {
+        width: 40vw;
+      }
       height: 290upx;
       background: #3385ff;
       border-radius: 0upx 0upx 83upx 83upx;

ghsApp/src/admin/home/me.vue

@@ -199,6 +199,7 @@ export default {
       });
       try {
         await toggleShop({ shopId: this.shopId })
+        //有多处相似地方，请全项目搜索about_store_clear
         // #ifdef MP-WEIXIN
         this.$store.commit("setLoginInfo", {})
         this.$util.pageTo({url: "/admin/home/me",type: 3})

ghsApp/src/admin/home/workbench.vue

@@ -237,6 +237,7 @@ export default {
 			let that = this
 			that.$util.confirmModal({title:"确定关闭？",content:'关闭后可以在底部菜单【我的】，找到【使用手册】重新打开'},() => {
 				closeBook().then((res) => {
+					//有多处相似地方，请全项目搜索about_store_clear
 					// #ifdef MP-WEIXIN
 					that.$store.commit("setLoginInfo", {})
 					that.$util.pageTo({url: "/admin/home/workbench",type: 3})

ghsApp/src/admin/shop/changeShop.vue

@@ -41,12 +41,17 @@ export default {
       },
       changeShop(id){
         switchGhsShop({shopId:id}).then(res=>{
-          this.$msg(res.msg);
-
-          //这个切换得更彻底
-          this.$store.commit("setLoginInfo", {})
-          this.$util.pageTo({url: "/admin/shop/changeShop",type: 3})
-
+          //有多处相似地方，请全项目搜索about_store_clear
+					// #ifdef MP-WEIXIN
+					that.$store.commit("setLoginInfo", {})
+					that.$util.pageTo({url: "/admin/home/workbench",type: 3})
+					// #endif
+					// #ifdef APP-PLUS
+					this.$store.commit("setLoginInfo", {})
+					this.$store.commit("setDictionariesInfo", {})
+					this.$store.commit("setMyShopInfo", {})
+					plus.runtime.restart()
+					// #endif
         })
       }
   },

ghsApp/src/pagesOrder/detail.vue

@@ -7,13 +7,13 @@
 			</view>
 			<view class="address-des_bx content-box" @click='pageTo({url:"/pagesClient/member/detail",query: {id: detailInfo.customId}})'>
 				<view>
-					<view> {{ detailInfo.customName }} {{ detailInfo.customMobile }} </view>
+					<view style="overflow:hidden;text-overflow:ellipsis;white-space: nowrap;width:450upx;"> {{ detailInfo.customName }} {{ detailInfo.customMobile }}</view>
 					<view style="margin-bottom:20upx;color:#333333">店长：{{ detailInfo.customSuper.name}}</view>
 					<view>{{ detailInfo.customAddress}}</view>
 				</view>
 				<view>
 				<i @click.stop="callUp(detailInfo.customMobile)" class="iconfont icondianhua1"></i>
-				<i @click.stop="navigateTo(detailInfo.lat,detailInfo.long,detailInfo.customName)" class="iconfont icondianhua" style="font-size:53upx;margin-left:15upx;margin-right:9upx;color:#3385ff;"></i>
+				<i @click.stop="navigateTo(detailInfo.lat,detailInfo.long,detailInfo.customName)" class="iconfont icondianhua" style="font-size:53upx;margin-left:40upx;margin-right:25upx;color:#3385ff;"></i>
 				</view>
 			</view>
 			<view class="title">