From 2f180d5178eb2b708d7cfb6c904e6aebf2b5e4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Mon, 21 Jun 2021 18:14:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E4=BA=8C=E7=BB=B4=E7=A0=81?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=20=E5=89=8D=E5=8F=B0=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E7=9B=B4=E6=92=AD=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=83=A8=E5=88=86ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.js                              |  2 +-
 manifest.json                                 |  4 +--
 pages/product/goods.vue                       |  5 ++--
 pages/product/product/goods/-goods-swiper.vue |  2 +-
 pages/product/product/style.scss              |  2 +-
 pages/tabbar/home/template/tpl.js             |  5 ++++
 pages/tabbar/home/views.vue                   | 25 +++++++++++++------
 7 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/config/config.js b/config/config.js
index 3ae7deb..699bb41 100644
--- a/config/config.js
+++ b/config/config.js
@@ -7,7 +7,7 @@ export default {
   appid: "wx6f10f29075dc1b0b", //小程序唯一凭证，即 AppID，可在「微信公众平台 - 设置 - 开发设置」页中获得。（需要已经成为开发者，且帐号没有异常状态）
   appSecret: "6dfbe0c72380dce5d49d65b3c91059b1", //可在 manifest.json 查看
   aMapKey: "d649892b3937a5ad20b76dacb2bcb5bd", //在高德中申请web端key
-  scanAuthNavigation:['https://m-b2b2c.pickmall.cn'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
+  scanAuthNavigation:['https://m-b2b2c.pickmall.cn/'], //扫码认证跳转域名配置 会根据此处配置的路由进行跳转
   iosAppId:"id1564638363", //AppStore的应用地址id 具体在分享->拷贝链接中查看
   logo:"https://lilishop-oss.oss-cn-beijing.aliyuncs.com/4c864e133c2944efad1f7282ac8a3b9e.png" //logo地址
 }; 
diff --git a/manifest.json b/manifest.json
index cd73584..82bd99e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "lili商城",
     "appid" : "__UNI__C100675",
     "description" : "",
-    "versionName" : "4.0.19",
-    "versionCode" : 4000019,
+    "versionName" : "4.0.20",
+    "versionCode" : 4000020,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
diff --git a/pages/product/goods.vue b/pages/product/goods.vue
index 80ac6bb..7d51752 100644
--- a/pages/product/goods.vue
+++ b/pages/product/goods.vue
@@ -118,7 +118,6 @@
           <!-- 拼团用户列表 -->
           <PromotionAssembleListLayout v-if="isGroup" @to-assemble-buy-now="toAssembleBuyNow" :res="PromotionList" />
 
-
           <!-- 配置地址 如果是虚拟产品的时候不展示 -->
           <view class="card-box" v-if="goodsDetail.goodsType !='VIRTUAL_GOODS'">
             <view class="card-flex" @click="shutMask(4)">
@@ -179,7 +178,7 @@
         </view>
         <!-- 正常结算页面 -->
         <view class="detail-btn" v-if="!isGroup">
-          <view class="to-store-car to-store-btn" v-if="goodsDetail.goodsType!='VIRTUAL_GOODS'"  @click="shutMask(4)">加入购物车</view>
+          <view class="to-store-car to-store-btn" v-if="goodsDetail.goodsType!='VIRTUAL_GOODS'" @click="shutMask(4)">加入购物车</view>
           <view class="to-buy to-store-btn" @click="shutMask(4, 'buy')">立即购买</view>
           <view class="to-store-car to-store-btn" v-if="startTimer">暂未开始</view>
         </view>
@@ -584,7 +583,6 @@ export default {
     toAssembleBuyNow(order) {
       this.shutMask(4, "PINTUAN", order);
     },
-
     /**
      * 查看购物车
      */
@@ -685,6 +683,7 @@ export default {
         keyword: this.goodsDetail.name,
       }).then((res) => {
         this.likeGoodsList = res.data.result.content;
+        console.warn(this.likeGoodsList);
       });
     },
 
diff --git a/pages/product/product/goods/-goods-swiper.vue b/pages/product/product/goods/-goods-swiper.vue
index 629a537..13e6d43 100644
--- a/pages/product/product/goods/-goods-swiper.vue
+++ b/pages/product/product/goods/-goods-swiper.vue
@@ -32,7 +32,7 @@ export default {
 <style lang="scss" scoped>
 .carousel {
   // #ifdef MP-WEIXIN
-  margin-top: var(--status-bar-height);
+  margin-top: 44px;
   // #endif
   width: 750rpx;
   height: 750rpx;
diff --git a/pages/product/product/style.scss b/pages/product/product/style.scss
index 86cab5e..cf8817c 100644
--- a/pages/product/product/style.scss
+++ b/pages/product/product/style.scss
@@ -131,7 +131,7 @@ page {
     display: flex;
     align-items: center;
     width: 100%;
-    background: #fff !important;
+    // background: #fff !important;
 
     > .headerList {
         flex: 8;
diff --git a/pages/tabbar/home/template/tpl.js b/pages/tabbar/home/template/tpl.js
index 0eda4d4..a436765 100644
--- a/pages/tabbar/home/template/tpl.js
+++ b/pages/tabbar/home/template/tpl.js
@@ -81,6 +81,11 @@ export function modelNavigateTo(item) {
             url: `/pages/promotion/joinGroup`,
           });
           break;
+        case "小程序直播":
+          uni.navigateTo({
+            url: `/pages/promotion/lives`,
+          });
+          break;
         case "积分商城":
           uni.switchTab({
             url: `/pages/navigation/point/point-mall`,
diff --git a/pages/tabbar/home/views.vue b/pages/tabbar/home/views.vue
index 97fe771..79ae09d 100644
--- a/pages/tabbar/home/views.vue
+++ b/pages/tabbar/home/views.vue
@@ -57,7 +57,7 @@ import tpl_goods from "@/pages/tabbar/home/template/tpl_goods"; //商品分类
 // 结束引用组件
 import { getFloorData } from "@/api/home"; //获取楼层装修接口
 import permision from "@/js_sdk/wa-permission/permission.js"; //权限工具类
-
+import config from "@/config/config";
 // TODO 后续开发
 // import tpl_join_group from "@/pages/tabbar/home/template/tpl_join_group";
 // import tpl_integral from "@/pages/tabbar/home/template/tpl_integral";
@@ -66,6 +66,7 @@ import permision from "@/js_sdk/wa-permission/permission.js"; //权限工具类
 export default {
   data() {
     return {
+      config,
       pageData: "", //楼层页面数据
     };
   },
@@ -118,12 +119,22 @@ export default {
       uni.scanCode({
         success: function (res) {
           let path = encodeURIComponent(res.result);
+          config.scanAuthNavigation.forEach((src) => {
+            if (res.result.indexOf(src) != -1) {
+                uni.navigateTo({
+                  url: `/${res.result.substring(src.length)}`,
+                });
+            } else {
+              setTimeout(() => {
+                uni.navigateTo({
+                  url: "/pages/tabbar/home/web-view?src=" + path,
+                });
+              }, 100);
+            }
+          });
+
+          // let
           // 扫码成功后跳转到webview页面
-          setTimeout(() => {
-            uni.navigateTo({
-              url: "/pages/tabbar/home/web-view?src=" + path,
-            });
-          }, 100);
         },
       });
     },
@@ -142,7 +153,7 @@ export default {
             if (isIos) {
               plus.runtime.openURL("app-settings:");
             } else {
-              permision.gotoAppPermissionSetting()
+              permision.gotoAppPermissionSetting();
             }
           }
         },