shish 2 mēneši atpakaļ
vecāks
revīzija
040fa8220a

+ 2 - 1
hdApp/src/admin/home/homeMenus.js

@@ -53,7 +53,8 @@ export const APPLY_MENU_GROUPS = [
       { name: '充值设置', icon: homeIcon('recharge'), url: '/admin/recharge/rechargeSetting', pf: 1 },
       { name: '收款码', icon: homeIcon('pay-code'), url: '/admin/cg/code', pf: 1 },
       { name: '收款流水', icon: homeIcon('pay-code-flow'), url: '/admin/order/scanPay', pf: 1 },
-      { name: '跑腿设置', icon: homeIcon('delivery'), url: '/admin/delivery/deliveryManage', pf: 1 }
+      { name: '绑定跑腿', icon: homeIcon('delivery'), url: '/admin/delivery/deliveryManage', pf: 1 },
+      { name: '配置范围', icon: homeIcon('send_area'), url: '/admin/shop/sk', pf: 1 }
     ]
   },
   {

+ 8 - 3
hdApp/src/admin/home/me.vue

@@ -266,7 +266,7 @@ export default {
       outAmountShow: false,
       inAmountShow: false,
       menuList: [
-        { key: "address", name: "跑腿设置", icon: "my-address" },
+        { key: "address", name: "修改门店", icon: "modify_shop" },
         { key: "book", name: "使用教程", icon: "my-book" },
         { key: "password", name: "密码修改", icon: "my-password" },
         { key: "cashSet", name: "提现账号", icon: "my-bell" },
@@ -342,7 +342,12 @@ export default {
     },
     handleMenuTap (item) {
       if (item.key == "address") {
-        this.$util.pageTo({ url: "/admin/shop/sk" });
+        const shopId =
+          uni.getStorageSync("shopId") ||
+          (this.getLoginInfo.admin && this.getLoginInfo.admin.currentShopId) ||
+          this.getLoginInfo.shopId ||
+          0;
+        this.$util.pageTo({ url: "/admin/shop/add?id=" + shopId });
       } else if (item.key == "book") {
         this.$util.pageTo({ url: "/admin/book/index" });
       } else if (item.key == "password") {
@@ -703,7 +708,7 @@ export default {
 }
 
 .expire-date {
-  margin-top: 6upx;
+  margin-top: 16upx;
   font-size: 38upx;
   line-height: 38upx;
   font-weight: 700;

+ 1 - 1
hdApp/src/pages.json

@@ -598,7 +598,7 @@
 		{
 			"root": "admin/delivery",
 			"pages": [
-				{ "path": "deliveryManage", "style": { "navigationBarTitleText": "跑腿设置" } },
+				{ "path": "deliveryManage", "style": { "navigationBarTitleText": "绑定跑腿" } },
 				{ "path": "shopDetail", "style": { "navigationBarTitleText": "门店" } },
 				{ "path": "allDelivery", "style": { "navigationBarTitleText": "配送平台报价" } }
 			]

+ 18 - 0
hdApp/src/pagesPurchase/open.vue

@@ -4,11 +4,14 @@
       <block v-if="onlyCg == 1">
         <view class="video-wrap">
           <video
+            id="openVideo"
             class="open-video"
             :src="videoUrl"
+            :autoplay="true"
             object-fit="contain"
             controls
             show-center-play-btn
+            @loadedmetadata="playOpenVideo"
           ></video>
         </view>
         <view class="tip-text">开通零售商城前,请先观看上面视频</view>
@@ -58,10 +61,25 @@ export default {
           this.onlyCg = Number(res.data.info.onlyCg);
         }
         this.loaded = true;
+        this.$nextTick(() => {
+          this.playOpenVideo();
+        });
       }).catch(() => {
         this.loaded = true;
+        this.$nextTick(() => {
+          this.playOpenVideo();
+        });
       });
     },
+    playOpenVideo() {
+      if (Number(this.onlyCg) !== 1 || !this.videoUrl) {
+        return;
+      }
+      const videoContext = uni.createVideoContext("openVideo", this);
+      if (videoContext) {
+        videoContext.play();
+      }
+    },
     beginChangeCg(num) {
       const title = num == 0 ? "开启" : "关闭";
       this.$util.confirmModal({ content: "确认" + title + "?", okText: "确认" }, () => {