From 126800f50cd39d18d15de960dd60636fb68951a7 Mon Sep 17 00:00:00 2001
From: Loki <654612@qq.com>
Date: Tue, 13 Sep 2022 18:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/PromotionGood.vue          | 4 ++--
 config/index.js                       | 5 +++--
 manifest.json                         | 6 +++---
 pages.json                            | 6 +++---
 pages/Loading/index.vue               | 1 -
 pages/home/components/Banner.vue      | 4 ++--
 pages/home/index.vue                  | 6 +++---
 pages/order/OrderSubmission/index.vue | 5 ++---
 pages/shop/GoodsCon/index.vue         | 2 +-
 utils/request.js                      | 3 ++-
 10 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/components/PromotionGood.vue b/components/PromotionGood.vue
index 1cc36e9..b6aa283 100644
--- a/components/PromotionGood.vue
+++ b/components/PromotionGood.vue
@@ -3,7 +3,7 @@
     <view class="sh-title-card mb10">
       <view class="title-box">
         <image class="title-bg" :src="`${$VUE_APP_RESOURCES_URL}/images/title1.png`" mode="aspectFill" />
-        <view class="title-text">精选食品</view>
+        <view class="title-text">精选</view>
         <!-- <view class="title-text" :style="{ color: detail.color }">为你推荐</view> -->
       </view>
     </view>
@@ -19,7 +19,7 @@
             <view class="title more-t">{{ item.storeName }}</view>
             <view class="price-box">
               <view class="flex x-bc align-end">
-                <view class="current"> 优品特价:{{ item.price }}  <text>/市场价:{{item.otPrice}}</text> </view>
+                <view class="current"> 活动特价:{{ item.price }}  <text>/市场价:{{item.otPrice}}</text> </view>
                 <view class="sales miso-font">仅剩：{{ item.stock }}{{ item.unitName }}</view>
               </view>
               <view class="x-f tag-box">
diff --git a/config/index.js b/config/index.js
index abdf365..5ce6611 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,4 +1,5 @@
-export const VUE_APP_API_URL = 'https://bxg.api.cyjyyjy.com/bxgApp'
-// export const VUE_APP_API_URL = 'http://192.168.10.254:48080/bxgApp'
+// export const VUE_APP_API_URL = 'http://192.168.10.129:48080/bxgApp'
+export const VUE_APP_API_URL = 'https://farm.lotus-wallet.com/bxgApp'
 // export const VUE_APP_API_URL = 'https://xiaohui.shop.cyjyyjy.com/xiaohuiapp'
 export const VUE_APP_RESOURCES_URL = 'https://h5.yixiang.co/static'
+export const BXG_TENANT_ID = 128
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 0aa07b6..8e5221f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name" : "yshopmall",
-    "appid" : "__UNI__C7A519E",
+    "name" : "zsw",
+    "appid" : "__UNI__74F040A",
     "description" : "",
     "versionName" : "1.0.1",
     "versionCode" : 1,
@@ -249,7 +249,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wxcd49c83634afd731",
+        "appid" : "wx144be2afc1798f59",
         "setting" : {
             "urlCheck" : false
         },
diff --git a/pages.json b/pages.json
index cde10ec..c0438f7 100644
--- a/pages.json
+++ b/pages.json
@@ -3,7 +3,7 @@
     {
       "path": "pages/Loading/index",
       "style": {
-        "navigationBarTitleText": "优品电商"
+        "navigationBarTitleText": "纽康度生物科技"
       }
     },
     {
@@ -40,7 +40,7 @@
     {
       "path": "pages/home/index",
       "style": {
-        "navigationBarTitleText": "优品电商",
+        "navigationBarTitleText": "纽康度生物科技",
         "navigationBarTextStyle": "white",
         "navigationStyle": "custom"
       }
@@ -444,7 +444,7 @@
   },
   "globalStyle": {
     "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "优品电商",
+    "navigationBarTitleText": "纽康度生物科技",
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8",
     "navigationStyle": "default"
diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue
index 4b3c790..7eb3737 100644
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@@ -1,7 +1,6 @@
 <template>
   <view class="lottie-bg">
     <view id="lottie">
-	  <!-- <text>武设优品电商</text> -->
     </view>
   </view>
 </template>
diff --git a/pages/home/components/Banner.vue b/pages/home/components/Banner.vue
index 067ec2a..e23fe7c 100644
--- a/pages/home/components/Banner.vue
+++ b/pages/home/components/Banner.vue
@@ -43,8 +43,8 @@
 				let bgcolor = item.color;
 				// 颜色不存在
 				if (!bgcolor) {
-					that.$set(item, 'bgcolor', '#c40414');
-					that.$emit('getbgcolor', '#c40414');
+					that.$set(item, 'bgcolor', '#0e2be6');
+					that.$emit('getbgcolor', '#0e2be6');
 				} else {
 					that.$set(item, 'bgcolor', bgcolor);
 					that.$emit('getbgcolor', bgcolor);
diff --git a/pages/home/index.vue b/pages/home/index.vue
index fe59fe8..fcdabdd 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -54,7 +54,7 @@
 	  :detail="benefit" />
       <!-- 直播 -->
       <!-- #ifdef MP-WEIXIN -->
-      <Live v-if="item.type == 'live'" :detail="live" />
+      <!-- <Live v-if="item.type == 'live'" :detail="live" /> -->
       <!-- #endif -->
       <!-- 为您推荐 -->
       <PromotionGood v-if="item.type == 'promotionGood'" :benefit="benefit" />
@@ -82,7 +82,7 @@ import Banner from './components/Banner'
 import HotCommodity from './components/HotCommodity'
 import FirstNewProduct from './components/FirstNewProduct'
 import ProductsRecommended from './components/ProductsRecommended'
-import Live from './components/Live'
+// import Live from './components/Live'
 
 import { getHomeData, getShare, getCanvas } from '@/api/public'
 import cookie from '@/utils/store/cookie'
@@ -108,7 +108,7 @@ export default {
     HotCommodity,
     FirstNewProduct,
     ProductsRecommended,
-    Live,
+    // Live,
   },
   props: {},
   data: function() {
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 1892b20..793089a 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -72,9 +72,8 @@
       </view>
       <view class="item acea-row row-between-wrapper" v-if="shipping_type === 0">
         <view>配送费用</view>
-        <view class="discount">
-			19元起送,配送免费,请保持手机畅通~
-          <!-- {{ orderGroupInfo.priceGroup.storePostage > 0 ? orderGroupInfo.priceGroup.storePostage : '免运费' }} -->
+        <view class="discount">
+          {{ orderGroupInfo.priceGroup.storePostage > 0 ? orderGroupInfo.priceGroup.storePostage : '免运费' }}
         </view>
       </view>
       <view v-if="shipping_type === 1">
diff --git a/pages/shop/GoodsCon/index.vue b/pages/shop/GoodsCon/index.vue
index 95ca4ba..bb48721 100644
--- a/pages/shop/GoodsCon/index.vue
+++ b/pages/shop/GoodsCon/index.vue
@@ -95,7 +95,7 @@
       <!-- <view class="superior">
         <view class="title acea-row row-center-wrapper">
           <image :src="`${$VUE_APP_RESOURCES_URL}/images/ling.png`" />
-          <text class="titleTxt">优品推荐</text>
+          <text class="titleTxt">推荐</text>
           <image :src="`${$VUE_APP_RESOURCES_URL}/images/ling.png`" />
         </view>
         <template>
diff --git a/utils/request.js b/utils/request.js
index 80060a4..f00e774 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -15,6 +15,7 @@ import Fly from 'flyio/dist/npm/wx'
 import store from '../store'
 import { handleLoginFailure } from '@/utils'
 import { VUE_APP_API_URL } from '@/config'
+import { BXG_TENANT_ID } from '@/config'
 import cookie from '@/utils/store/cookie'
 
 const fly = new Fly()
@@ -74,7 +75,7 @@ function baseRequest(options) {
 console.log(options)
 
   options.headers = {
-	  "tenant-id": 125,
+	  "tenant-id": BXG_TENANT_ID,
     ...options.headers,
 	// hahah: 'Bearer2 ',
   }