From 7f4aecb936119198d6a1da4bc5e2a5c88758d9ae Mon Sep 17 00:00:00 2001
From: Boom <654612@qq.com>
Date: Sat, 18 Nov 2023 13:46:52 +0800
Subject: [PATCH] :+1:

---
 README.md                          |   4 +-
 components/ShopLiveCard.vue        |   4 +-
 components/UserEvaluation.vue      |   2 +-
 config/index.js                    |   2 +-
 manifest.json                      |  21 +-
 package.json                       |   2 +-
 pages.json                         | 984 ++++++++++++++---------------
 pages/authorization/index.vue      |   2 +-
 pages/home/components/Live.vue     |   4 +-
 pages/home/index.vue               |   6 +-
 pages/shop/Live/LiveList/index.vue |   4 +-
 pages/user/User/index.vue          |   4 +-
 utils/request.js                   |   1 +
 13 files changed, 519 insertions(+), 521 deletions(-)

diff --git a/README.md b/README.md
index 318dff4..5ac1f15 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@
 
 ## 注意事项
 
-- uniapp v3.1 版本已经兼容 h5，另外 yshop 有自己的 H5，uniappv3.1 以下版本未对 H5 端进行处理，如果需要请自行兼容。
+- uniapp v3.1 版本已经兼容 h5，另外  有自己的 H5，uniappv3.1 以下版本未对 H5 端进行处理，如果需要请自行兼容。
 - manifest.json 中可以配置 uni 项目的一些信息
 - 打开 manifest.json 可配置小程序的 appid
 - 由于需要兼容 app，公共样式由 main.js 迁移到了 App.vue，公共样式请在 App.vue 中进行编辑
@@ -24,7 +24,7 @@
 
 ## git issuse 地址
 
-https://gitee.com/guchengwuyue/yshopmall
+https://gitee.com/guchengwuyue/mall
 
 ### 请按照以下模板提交 issuse
 
diff --git a/components/ShopLiveCard.vue b/components/ShopLiveCard.vue
index 697e319..f7fdea1 100644
--- a/components/ShopLiveCard.vue
+++ b/components/ShopLiveCard.vue
@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
 	<view class="sp-live-card" :style="{ width: wh + 'rpx' }">
 		<view class="live-content" @tap="goRoom" :style="{ width: wh + 'rpx' }">
 			<image class="item-cover" :src="detail.shareImge" mode="aspectFill"></image>
@@ -321,4 +321,4 @@
 			}
 		}
 	}
-</style>
+</style> -->
diff --git a/components/UserEvaluation.vue b/components/UserEvaluation.vue
index 545192a..5de1ffe 100644
--- a/components/UserEvaluation.vue
+++ b/components/UserEvaluation.vue
@@ -19,7 +19,7 @@
           </view>
         </view>
         <view class="reply" v-if="item.merchantReplyContent">
-          <span class="font-color-red">yshop店员</span>
+          <span class="font-color-red">店员</span>
           ：{{item.merchantReplyContent}}
         </view>
       </view>
diff --git a/config/index.js b/config/index.js
index 9eec2c8..81b0e22 100644
--- a/config/index.js
+++ b/config/index.js
@@ -1,7 +1,7 @@
 // export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://wxapi.yixiang.co/api'
 // export const VUE_APP_API_URL = '/h5api'
-export const VUE_APP_API_URL = 'http://127.0.0.1:8008/api'
+export const VUE_APP_API_URL = 'http://192.168.10.129:48080/bxgApp'
 // export const VUE_APP_API_URL = 'http://192.168.31.223:8008/api'
 //  export const VUE_APP_API_URL = 'http://natapp.xinxintuan.co/api';
 // export const VUE_APP_API_URL = 'https://thapi.xinxintuan.co/api'
diff --git a/manifest.json b/manifest.json
index bd30286..8d67681 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
 {
-    "name" : "yshopmall",
-    "appid" : "__UNI__CF66760",
+    "name" : "ZSW",
+    "appid" : "__UNI__7085CB1",
     "description" : "",
     "versionName" : "1.0.2",
     "versionCode" : 2,
@@ -243,7 +243,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx604d2ea4702620d2",
+        "appid" : "wx2914c96abb4b0be9",
         "setting" : {
             "urlCheck" : false
         },
@@ -254,14 +254,13 @@
             }
         },
         // "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
-        "plugins" : {
-            // #ifdef MP-WEIXIN
-            "live-player-plugin" : {
-                "version" : "1.2.8",
-                "provider" : "wx2b03c6e691cd7370"
-            }
-        }
+        "plugins" : {}
     },
+    // #ifdef MP-WEIXIN
+    // "live-player-plugin" : {
+    //     "version" : "1.2.8",
+    //     "provider" : "wx2b03c6e691cd7370"
+    // }
     // #endif
     "mp-alipay" : {
         "usingComponents" : true
@@ -273,7 +272,7 @@
         "usingComponents" : true
     },
     "h5" : {
-        "title" : "yshop",
+        "title" : "mall",
         "devServer" : {
             "disableHostCheck" : true,
             "proxy" : {
diff --git a/package.json b/package.json
index eadf700..d313710 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "yshopmall_uni",
+  "name": "mall_uni",
   "version": "3.3.0",
   "description": "",
   "main": "main.js",
diff --git a/pages.json b/pages.json
index 59b3a9b..c6fa7ce 100644
--- a/pages.json
+++ b/pages.json
@@ -1,497 +1,495 @@
 {
-  "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-    {
-      "path": "pages/Loading/index",
-      "style": {
-        "navigationBarTitleText": "yshop商城"
-      }
-    },
-    {
-      "path": "pages/authorization/index",
-      "style": {
-        "navigationBarTitleText": "微信授权"
-      }
-    },
-    {
-      "path": "pages/user/Login/index",
-      "style": {
-        "navigationBarTitleText": "登录"
-      }
-    },
-    {
-      "path": "pages/user/Register/index",
-      "style": {
-        "navigationBarTitleText": "注册"
-      }
-    },
-    {
-      // "path": "pages/user/RetrievePassword/index",
-	  "path": "pages/user/ChangePassword/index",
-      "style": {
-        "navigationBarTitleText": "重置密码"
-      }
-    },
-    {
-      "path": "pages/launch/index",
-      "style": {
-        "navigationBarTitleText": "首页"
-      }
-    },
-    {
-      "path": "pages/home/index",
-      "style": {
-        "navigationBarTitleText": "yshop商城",
-        "navigationBarTextStyle": "white",
-        "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/shop/GoodSearch/index",
-      "style": {
-        "navigationBarTitleText": "搜索商品"
-      }
-    },
-    {
-      "path": "pages/shop/GoodsClass/index",
-      "style": {
-        "navigationBarTitleText": "商品分类"
-      }
-    },
-    {
-      "path": "pages/shop/ShoppingCart/index",
-      "style": {
-        "navigationBarTitleText": "购物车"
-      }
-    },
-    {
-      "path": "pages/shop/StoreList/index",
-      "style": {
-        "navigationBarTitleText": "商家列表"
-      }
-    },
-    {
-      "path": "pages/shop/GoodsList/index",
-      "style": {
-        "navigationBarTitleText": "商品列表"
-      }
-    },
-    {
-      "path": "pages/NotDefined/index",
-      "style": {
-        "navigationBarTitleText": "404"
-      }
-    },
-    {
-      "path": "pages/user/User/index",
-      "style": {
-        "navigationBarTitleText": "我的"
-      }
-    },
-    {
-      "path": "pages/shop/GoodsCollection/index",
-      "style": {
-        "navigationBarTitleText": "商品收藏"
-      }
-    },
-    {
-      "path": "pages/shop/GoodsFoot/index",
-      "style": {
-        "navigationBarTitleText": "我的足迹"
-      }
-    },
-    {
-      "path": "pages/shop/news/NewsDetail/index",
-      "style": {
-        "navigationBarTitleText": "新闻详情"
-      }
-    },
-    {
-      "path": "pages/shop/news/NewsList/index",
-      "style": {
-        "navigationBarTitleText": "新闻列表"
-      }
-    },
-    {
-      "path": "pages/shop/EvaluateList/index",
-      "style": {
-        "navigationBarTitleText": "评价列表"
-      }
-    },
-    {
-      "path": "pages/shop/GoodsEvaluate/index",
-      "style": {
-        "navigationBarTitleText": "商品评价"
-      }
-    },
-    {
-      "path": "pages/shop/GoodsPromotion/index",
-      "style": {
-        "navigationBarTitleText": "促销商品"
-      }
-    },
-    {
-      "path": "pages/shop/HotNewGoods/index",
-      "style": {
-        "navigationBarTitleText": "热门商品"
-      }
-    },
-    {
-      "path": "pages/shop/GoodsCon/index",
-      "style": {
-        "navigationBarTitleText": "商品详情"
-      }
-    },
-    {
-      "path": "pages/shop/IntegralGoodsCon/index",
-      "style": {
-        "navigationBarTitleText": "积分商品详情"
-      }
-    },
-    {
-      "path": "pages/user/BindingPhone/index",
-      "style": {
-        "navigationBarTitleText": "绑定手机号"
-      }
-    },
-    {
-      "path": "pages/user/address/AddAddress/index",
-      "style": {
-        "navigationBarTitleText": "新增收货地址"
-      }
-    },
-    {
-      "path": "pages/user/UserAccount/index",
-      "style": {
-        "navigationBarTitleText": "账户余额"
-      }
-    },
-    {
-      "path": "pages/user/address/AddressManagement/index",
-      "style": {
-        "navigationBarTitleText": "收货地址"
-      }
-    },
-    {
-      "path": "pages/user/promotion/Poster/index",
-      "style": {
-        "navigationBarTitleText": "推广名片"
-      }
-    },
-    {
-      "path": "pages/user/signIn/Sign/index",
-      "style": {
-        "navigationBarTitleText": "签到"
-      }
-    },
-    {
-      "path": "pages/user/signIn/SignRecord/index",
-      "style": {
-        "navigationBarTitleText": "签到记录"
-      }
-    },
-    {
-      "path": "pages/user/promotion/CashAudit/index",
-      "style": {
-        "navigationBarTitleText": "提现结果"
-      }
-    },
-    {
-      "path": "pages/user/promotion/PromoterOrder/index",
-      "style": {
-        "navigationBarTitleText": "分销详情"
-      }
-    },
-    {
-      "path": "pages/user/promotion/PromoterList/index",
-      "style": {
-        "navigationBarTitleText": "分销列表"
-      }
-    },
-    {
-      "path": "pages/user/promotion/UserPromotion/index",
-      "style": {
-        "navigationBarTitleText": "佣金"
-      }
-    },
-    {
-      "path": "pages/user/UserBill/index",
-      "style": {
-        "navigationBarTitleText": "账单记录"
-      }
-    },
-    {
-      "path": "pages/user/promotion/CashRecord/index",
-      "style": {
-        "navigationBarTitleText": "提现记录"
-      }
-    },
-    {
-      "path": "pages/user/promotion/CommissionDetails/index",
-      "style": {
-        "navigationBarTitleText": "佣金明细"
-      }
-    },
-    {
-      "path": "pages/user/signIn/Integral/index",
-      "style": {
-        "navigationBarTitleText": "我的积分"
-      }
-    },
-    {
-      "path": "pages/user/UserVip/index",
-      "style": {
-        "navigationBarTitleText": "用户vip"
-      }
-    },
-    {
-      "path": "pages/user/PersonalData/index",
-      "style": {
-        "navigationBarTitleText": "个人资料"
-      }
-    },
-    {
-      "path": "pages/user/coupon/UserCoupon/index",
-      "style": {
-        "navigationBarTitleText": "优惠券"
-      }
-    },
-    {
-      "path": "pages/user/coupon/GetCoupon/index",
-      "style": {
-        "navigationBarTitleText": "领取优惠券"
-      }
-    },
-    {
-      "path": "pages/user/promotion/UserCash/index",
-      "style": {
-        "navigationBarTitleText": "提现"
-      }
-    },
-    {
-      "path": "pages/user/CustomerList/index",
-      "style": {
-        "navigationBarTitleText": "客服列表"
-      }
-    },
-    {
-      "path": "pages/user/Recharge/index",
-      "style": {
-        "navigationBarTitleText": "充值"
-      }
-    },
-    {
-      "path": "pages/order/MyOrder/index",
-      "style": {
-        "navigationBarTitleText": "我的订单"
-      }
-    },
-    {
-      "path": "pages/order/Logistics/index",
-      "style": {
-        "navigationBarTitleText": "查看物流"
-      }
-    },
-    {
-      "path": "pages/order/OrderDetails/index",
-      "style": {
-        "navigationBarTitleText": "订单详情"
-      }
-    },
-	{
-		"path" : "pages/order/OrderReturnDetail/index",
-		"style": {
-			"navigationBarTitleText": "售后详情"
+	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
+		{
+			"path": "pages/Loading/index",
+			"style": {
+				"navigationBarTitleText": "系统"
+			}
+		},
+		{
+			"path": "pages/authorization/index",
+			"style": {
+				"navigationBarTitleText": "微信授权"
+			}
+		},
+		{
+			"path": "pages/user/Login/index",
+			"style": {
+				"navigationBarTitleText": "登录"
+			}
+		},
+		{
+			"path": "pages/user/Register/index",
+			"style": {
+				"navigationBarTitleText": "注册"
+			}
+		},
+		{
+			// "path": "pages/user/RetrievePassword/index",
+			"path": "pages/user/ChangePassword/index",
+			"style": {
+				"navigationBarTitleText": "重置密码"
+			}
+		},
+		{
+			"path": "pages/launch/index",
+			"style": {
+				"navigationBarTitleText": "首页"
+			}
+		},
+		{
+			"path": "pages/home/index",
+			"style": {
+				"navigationBarTitleText": "系统",
+				"navigationBarTextStyle": "white",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/shop/GoodSearch/index",
+			"style": {
+				"navigationBarTitleText": "搜索商品"
+			}
+		},
+		{
+			"path": "pages/shop/GoodsClass/index",
+			"style": {
+				"navigationBarTitleText": "商品分类"
+			}
+		},
+		{
+			"path": "pages/shop/ShoppingCart/index",
+			"style": {
+				"navigationBarTitleText": "购物车"
+			}
+		},
+		{
+			"path": "pages/shop/StoreList/index",
+			"style": {
+				"navigationBarTitleText": "商家列表"
+			}
+		},
+		{
+			"path": "pages/shop/GoodsList/index",
+			"style": {
+				"navigationBarTitleText": "商品列表"
+			}
+		},
+		{
+			"path": "pages/NotDefined/index",
+			"style": {
+				"navigationBarTitleText": "404"
+			}
+		},
+		{
+			"path": "pages/user/User/index",
+			"style": {
+				"navigationBarTitleText": "我的"
+			}
+		},
+		{
+			"path": "pages/shop/GoodsCollection/index",
+			"style": {
+				"navigationBarTitleText": "商品收藏"
+			}
+		},
+		{
+			"path": "pages/shop/GoodsFoot/index",
+			"style": {
+				"navigationBarTitleText": "我的足迹"
+			}
+		},
+		{
+			"path": "pages/shop/news/NewsDetail/index",
+			"style": {
+				"navigationBarTitleText": "新闻详情"
+			}
+		},
+		{
+			"path": "pages/shop/news/NewsList/index",
+			"style": {
+				"navigationBarTitleText": "新闻列表"
+			}
+		},
+		{
+			"path": "pages/shop/EvaluateList/index",
+			"style": {
+				"navigationBarTitleText": "评价列表"
+			}
+		},
+		{
+			"path": "pages/shop/GoodsEvaluate/index",
+			"style": {
+				"navigationBarTitleText": "商品评价"
+			}
+		},
+		{
+			"path": "pages/shop/GoodsPromotion/index",
+			"style": {
+				"navigationBarTitleText": "促销商品"
+			}
+		},
+		{
+			"path": "pages/shop/HotNewGoods/index",
+			"style": {
+				"navigationBarTitleText": "热门商品"
+			}
+		},
+		{
+			"path": "pages/shop/GoodsCon/index",
+			"style": {
+				"navigationBarTitleText": "商品详情"
+			}
+		},
+		{
+			"path": "pages/shop/IntegralGoodsCon/index",
+			"style": {
+				"navigationBarTitleText": "积分商品详情"
+			}
+		},
+		{
+			"path": "pages/user/BindingPhone/index",
+			"style": {
+				"navigationBarTitleText": "绑定手机号"
+			}
+		},
+		{
+			"path": "pages/user/address/AddAddress/index",
+			"style": {
+				"navigationBarTitleText": "新增收货地址"
+			}
+		},
+		{
+			"path": "pages/user/UserAccount/index",
+			"style": {
+				"navigationBarTitleText": "账户余额"
+			}
+		},
+		{
+			"path": "pages/user/address/AddressManagement/index",
+			"style": {
+				"navigationBarTitleText": "收货地址"
+			}
+		},
+		{
+			"path": "pages/user/promotion/Poster/index",
+			"style": {
+				"navigationBarTitleText": "推广名片"
+			}
+		},
+		{
+			"path": "pages/user/signIn/Sign/index",
+			"style": {
+				"navigationBarTitleText": "签到"
+			}
+		},
+		{
+			"path": "pages/user/signIn/SignRecord/index",
+			"style": {
+				"navigationBarTitleText": "签到记录"
+			}
+		},
+		{
+			"path": "pages/user/promotion/CashAudit/index",
+			"style": {
+				"navigationBarTitleText": "提现结果"
+			}
+		},
+		{
+			"path": "pages/user/promotion/PromoterOrder/index",
+			"style": {
+				"navigationBarTitleText": "分销详情"
+			}
+		},
+		{
+			"path": "pages/user/promotion/PromoterList/index",
+			"style": {
+				"navigationBarTitleText": "分销列表"
+			}
+		},
+		{
+			"path": "pages/user/promotion/UserPromotion/index",
+			"style": {
+				"navigationBarTitleText": "佣金"
+			}
+		},
+		{
+			"path": "pages/user/UserBill/index",
+			"style": {
+				"navigationBarTitleText": "账单记录"
+			}
+		},
+		{
+			"path": "pages/user/promotion/CashRecord/index",
+			"style": {
+				"navigationBarTitleText": "提现记录"
+			}
+		},
+		{
+			"path": "pages/user/promotion/CommissionDetails/index",
+			"style": {
+				"navigationBarTitleText": "佣金明细"
+			}
+		},
+		{
+			"path": "pages/user/signIn/Integral/index",
+			"style": {
+				"navigationBarTitleText": "我的积分"
+			}
+		},
+		{
+			"path": "pages/user/UserVip/index",
+			"style": {
+				"navigationBarTitleText": "用户vip"
+			}
+		},
+		{
+			"path": "pages/user/PersonalData/index",
+			"style": {
+				"navigationBarTitleText": "个人资料"
+			}
+		},
+		{
+			"path": "pages/user/coupon/UserCoupon/index",
+			"style": {
+				"navigationBarTitleText": "优惠券"
+			}
+		},
+		{
+			"path": "pages/user/coupon/GetCoupon/index",
+			"style": {
+				"navigationBarTitleText": "领取优惠券"
+			}
+		},
+		{
+			"path": "pages/user/promotion/UserCash/index",
+			"style": {
+				"navigationBarTitleText": "提现"
+			}
+		},
+		{
+			"path": "pages/user/CustomerList/index",
+			"style": {
+				"navigationBarTitleText": "客服列表"
+			}
+		},
+		{
+			"path": "pages/user/Recharge/index",
+			"style": {
+				"navigationBarTitleText": "充值"
+			}
+		},
+		{
+			"path": "pages/order/MyOrder/index",
+			"style": {
+				"navigationBarTitleText": "我的订单"
+			}
+		},
+		{
+			"path": "pages/order/Logistics/index",
+			"style": {
+				"navigationBarTitleText": "查看物流"
+			}
+		},
+		{
+			"path": "pages/order/OrderDetails/index",
+			"style": {
+				"navigationBarTitleText": "订单详情"
+			}
+		},
+		{
+			"path": "pages/order/OrderReturnDetail/index",
+			"style": {
+				"navigationBarTitleText": "售后详情"
+			}
+		},
+		{
+			"path": "pages/order/OrderSubmission/index",
+			"style": {
+				"navigationBarTitleText": "提交订单"
+			}
+		},
+		{
+			"path": "pages/order/PaymentStatus/index",
+			"style": {
+				"navigationBarTitleText": "支付状态"
+			}
+		},
+		{
+			"path": "pages/order/GoodsReturn/index",
+			"style": {
+				"navigationBarTitleText": "商品退货"
+			}
+		},
+		{
+			"path": "pages/order/ReturnList/index",
+			"style": {
+				"navigationBarTitleText": "我的售后"
+			}
+		},
+		{
+			"path": "pages/order/submitExpress/index",
+			"style": {
+				"navigationBarTitleText": "售后物流填写"
+			}
+		},
+		{
+			"path": "pages/orderAdmin/OrderIndex/index",
+			"style": {
+				"navigationBarTitleText": "商家订单统计"
+			}
+		},
+		{
+			"path": "pages/orderAdmin/AdminOrderList/index",
+			"style": {
+				"navigationBarTitleText": "订单"
+			}
+		},
+		{
+			"path": "pages/orderAdmin/GoodsDeliver/index",
+			"style": {
+				"navigationBarTitleText": "发货"
+			}
+		},
+		{
+			"path": "pages/orderAdmin/AdminOrder/index",
+			"style": {
+				"navigationBarTitleText": "商家订单列表"
+			}
+		},
+		{
+			"path": "pages/orderAdmin/Statistics/index",
+			"style": {
+				"navigationBarTitleText": "商家统计数据"
+			}
+		},
+		{
+			"path": "pages/orderAdmin/OrderCancellation/index",
+			"style": {
+				"navigationBarTitleText": "商家核销订单"
+			}
+		},
+		{
+			"path": "pages/activity/Poster/index",
+			"style": {
+				"navigationBarTitleText": "推广海报"
+			}
+		},
+		{
+			"path": "pages/activity/DargainDetails/index",
+			"style": {
+				"navigationBarTitleText": "帮砍价"
+			}
+		},
+		{
+			"path": "pages/activity/GoodsBargain/index",
+			"style": {
+				"navigationBarTitleText": "砍价列表"
+			}
+		},
+		{
+			"path": "pages/activity/BargainRecord/index",
+			"style": {
+				"navigationBarTitleText": "砍价记录"
+			}
+		},
+		{
+			"path": "pages/activity/GoodsGroup/index",
+			"style": {
+				"navigationBarTitleText": "团购商品列表"
+			}
+		},
+		{
+			"path": "pages/activity/GroupDetails/index",
+			"style": {
+				"navigationBarTitleText": "团购商品详情"
+			}
+		},
+		{
+			"path": "pages/activity/GroupRule/index",
+			"style": {
+				"navigationBarTitleText": "团购规则"
+			}
+		},
+		{
+			"path": "pages/activity/GoodsSeckill/index",
+			"style": {
+				"navigationBarTitleText": "秒杀"
+			}
+		},
+		{
+			"path": "pages/activity/SeckillDetails/index",
+			"style": {
+				"navigationBarTitleText": "秒杀详情"
+			}
+		},
+		{
+			"path": "pages/map/index",
+			"style": {
+				"navigationBarTitleText": "地图"
+			}
+		},
+		// {
+		// 	"path": "pages/shop/Live/LiveList/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "直播列表"
+		// 	}
+		// },
+		{
+			"path": "pages/user/content/content",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	],
+	"easycom": {
+		"autoscan": true,
+		"custom": {
+			"tui-(.*)": "@/components/tui-$1/tui-$1.vue"
 		}
 	},
-    {
-      "path": "pages/order/OrderSubmission/index",
-      "style": {
-        "navigationBarTitleText": "提交订单"
-      }
-    },
-    {
-      "path": "pages/order/PaymentStatus/index",
-      "style": {
-        "navigationBarTitleText": "支付状态"
-      }
-    },
-    {
-      "path": "pages/order/GoodsReturn/index",
-      "style": {
-        "navigationBarTitleText": "商品退货"
-      }
-    },
-    {
-      "path": "pages/order/ReturnList/index",
-      "style": {
-        "navigationBarTitleText": "我的售后"
-      }
-    },
-	{
-	  "path": "pages/order/submitExpress/index",
-	  "style": {
-	    "navigationBarTitleText": "售后物流填写"
-	  }
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "ZSW",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F8F8F8",
+		"navigationStyle": "default"
 	},
-    {
-      "path": "pages/orderAdmin/OrderIndex/index",
-      "style": {
-        "navigationBarTitleText": "商家订单统计"
-      }
-    },
-    {
-      "path": "pages/orderAdmin/AdminOrderList/index",
-      "style": {
-        "navigationBarTitleText": "订单"
-      }
-    },
-    {
-      "path": "pages/orderAdmin/GoodsDeliver/index",
-      "style": {
-        "navigationBarTitleText": "发货"
-      }
-    },
-    {
-      "path": "pages/orderAdmin/AdminOrder/index",
-      "style": {
-        "navigationBarTitleText": "商家订单列表"
-      }
-    },
-    {
-      "path": "pages/orderAdmin/Statistics/index",
-      "style": {
-        "navigationBarTitleText": "商家统计数据"
-      }
-    },
-    {
-      "path": "pages/orderAdmin/OrderCancellation/index",
-      "style": {
-        "navigationBarTitleText": "商家核销订单"
-      }
-    },
-    {
-      "path": "pages/activity/Poster/index",
-      "style": {
-        "navigationBarTitleText": "推广海报"
-      }
-    },
-    {
-      "path": "pages/activity/DargainDetails/index",
-      "style": {
-        "navigationBarTitleText": "帮砍价"
-      }
-    },
-    {
-      "path": "pages/activity/GoodsBargain/index",
-      "style": {
-        "navigationBarTitleText": "砍价列表"
-      }
-    },
-    {
-      "path": "pages/activity/BargainRecord/index",
-      "style": {
-        "navigationBarTitleText": "砍价记录"
-      }
-    },
-    {
-      "path": "pages/activity/GoodsGroup/index",
-      "style": {
-        "navigationBarTitleText": "团购商品列表"
-      }
-    },
-    {
-      "path": "pages/activity/GroupDetails/index",
-      "style": {
-        "navigationBarTitleText": "团购商品详情"
-      }
-    },
-    {
-      "path": "pages/activity/GroupRule/index",
-      "style": {
-        "navigationBarTitleText": "团购规则"
-      }
-    },
-    {
-      "path": "pages/activity/GoodsSeckill/index",
-      "style": {
-        "navigationBarTitleText": "秒杀"
-      }
-    },
-    {
-      "path": "pages/activity/SeckillDetails/index",
-      "style": {
-        "navigationBarTitleText": "秒杀详情"
-      }
-    },
-    {
-      "path": "pages/map/index",
-      "style": {
-        "navigationBarTitleText": "地图"
-      }
-    },
-    {
-      "path": "pages/shop/Live/LiveList/index",
-      "style": {
-        "navigationBarTitleText": "直播列表"
-      }
-    }
-        ,{
-            "path" : "pages/user/content/content",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
-    ],
-  "easycom": {
-    "autoscan": true,
-    "custom": {
-      "tui-(.*)": "@/components/tui-$1/tui-$1.vue"
-    }
-  },
-  "globalStyle": {
-    "navigationBarTextStyle": "black",
-    "navigationBarTitleText": "Yshop",
-    "navigationBarBackgroundColor": "#F8F8F8",
-    "backgroundColor": "#F8F8F8",
-	"navigationStyle": "default"
-  },
-  "tabBar": {
-    "color": "#282828",
-    "selectedColor": "#eb3729",
-    "borderStyle": "black",
-    "backgroundColor": "#ffffff",
-    "height": "50px",
-    "fontSize": "10px",
-    "iconWidth": "24px",
-    "spacing": "3px",
-    "list": [
-      {
-        "pagePath": "pages/home/index",
-        "iconPath": "static/icon-home.png",
-        "selectedIconPath": "static/icon-home-hot.png",
-        "text": "首页"
-      },
-      {
-        "pagePath": "pages/shop/GoodsClass/index",
-        "iconPath": "static/icon-class.png",
-        "selectedIconPath": "static/icon-class-hot.png",
-        "text": "分类"
-      },
-      {
-        "pagePath": "pages/shop/ShoppingCart/index",
-        "iconPath": "static/icon-cart.png",
-        "selectedIconPath": "static/icon-cart-hot.png",
-        "text": "购物车"
-      },
-      {
-        "pagePath": "pages/user/User/index",
-        "iconPath": "static/icon-user.png",
-        "selectedIconPath": "static/icon-user-hot.png",
-        "text": "我的"
-      }
-    ]
-  }
-}
+	"tabBar": {
+		"color": "#282828",
+		"selectedColor": "#eb3729",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"height": "50px",
+		"fontSize": "10px",
+		"iconWidth": "24px",
+		"spacing": "3px",
+		"list": [{
+				"pagePath": "pages/home/index",
+				"iconPath": "static/icon-home.png",
+				"selectedIconPath": "static/icon-home-hot.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/shop/GoodsClass/index",
+				"iconPath": "static/icon-class.png",
+				"selectedIconPath": "static/icon-class-hot.png",
+				"text": "分类"
+			},
+			{
+				"pagePath": "pages/shop/ShoppingCart/index",
+				"iconPath": "static/icon-cart.png",
+				"selectedIconPath": "static/icon-cart-hot.png",
+				"text": "购物车"
+			},
+			{
+				"pagePath": "pages/user/User/index",
+				"iconPath": "static/icon-user.png",
+				"selectedIconPath": "static/icon-user-hot.png",
+				"text": "我的"
+			}
+		]
+	}
+}
\ No newline at end of file
diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index 4592057..97aa22d 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -7,7 +7,7 @@
     >
       <view class="force-login__content y-f">
 		<image src="@/static/120x120.png" style="width: 100rpx; height: 100rpx;border-radius: 100rpx;"></image>
-        <view class="login-notice">YSHOP电商系统</view>
+        <view class="login-notice">电商系统</view>
         <button
           class="cu-btn author-btn"
           open-type="getPhoneNumber"
diff --git a/pages/home/components/Live.vue b/pages/home/components/Live.vue
index 14c70c1..87d1a80 100644
--- a/pages/home/components/Live.vue
+++ b/pages/home/components/Live.vue
@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
 	<view class="live-el mx20 mb10">
 		<view class="head">
 			<text class="head-title">热门直播</text>
@@ -243,4 +243,4 @@
 			}
 		}
 	}
-</style>
+</style> -->
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/shop/Live/LiveList/index.vue b/pages/shop/Live/LiveList/index.vue
index 287f01a..d0ddaf0 100644
--- a/pages/shop/Live/LiveList/index.vue
+++ b/pages/shop/Live/LiveList/index.vue
@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
   <view class="page_box">
     <view class="head_box">
       <view class="live-tab">
@@ -179,4 +179,4 @@
       padding: 25rpx;
     }
   }
-</style>
+</style> -->
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 838b256..e31b962 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -197,7 +197,7 @@
       </view>
       <view class="by">
         <view>
-          <text class="by-text">www.yixiang.co提供技术支持</text>
+          <text class="by-text">@</text>
         </view>
       </view>
       <!-- <SwitchWindow
@@ -482,7 +482,7 @@ export default {
     },
   },
   onShow() {
-    if (this.$store.getters.token) {
+    if (this.$store.getters.token) {
 		console.log('userInfo11:',this.$store.getters.token)
       //
       uni.showLoading({
diff --git a/utils/request.js b/utils/request.js
index 38a5fcf..b03ce50 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -75,6 +75,7 @@ console.log(options)
 
   options.headers = {
     ...options.headers,
+	"tenant-id": '1', 
 	// hahah: 'Bearer2 ',
   }
   // if(options.method=='post'){