chengjunhui 1 mês atrás
pai
commit
a93b05d6ef
4 arquivos alterados com 56 adições e 170 exclusões
  1. 1 1
      config/global.config.js
  2. 2 2
      manifest.json
  3. 41 155
      pages.json
  4. 12 12
      pages/tabtar/personalCenter.vue

+ 1 - 1
config/global.config.js

@@ -2,7 +2,7 @@ const CONFIG = {
     staticUrl: 'https://shop.xiaocaituan.com/image', // 所有图片服务器地址 https://shop.xiaocaituan.com/image
 
     // baseUrl: 'http://192.168.0.152:8300/api', // 后台接、口请求地址
-    // baseUrl: 'http://192.168.0.70:8300/api', // 后台接、口请求地址
+    baseUrl: 'http://192.168.0.70:8300/api', // 后台接、口请求地址
 		
     baseUrl: 'https://shop.xiaocaituan.com/hd-api/api', // 正式接口请求地址
     telRegex: /^1[3-9]\d{9}$/, //手机正则

+ 2 - 2
manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "小彩团",
+    "name" : "商城",
     "appid" : "__UNI__5F728EA",
     "description" : "",
     "versionName" : "1.0.0",
@@ -123,7 +123,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxf4cb2367022f4941",
+        "appid" : "wxd15dbb580e6f1cd3",
         "setting" : {
             "urlCheck" : false,
             "minified" : true

+ 41 - 155
pages.json

@@ -1,6 +1,5 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-
 		{
 			"path": "pages/tabtar/home",
 			"style": {
@@ -48,7 +47,7 @@
 		// 	}
 		// },
 		{
-			"path": "pages/tabtar/goodsType",
+			"path": "pages/goodsType/index",
 			"style": {
 				"navigationBarTitleText": "商品分类",
 				"navigationStyle": "custom"
@@ -126,9 +125,11 @@
 			}
 		}
 	],
-	"subPackages": [{
+	"subPackages": [
+		{
 			"root": "pages/shop",
-			"pages": [{
+			"pages": [
+				{
 					"path": "content/index",
 					"style": {
 						"navigationBarTitleText": "店铺中心",
@@ -253,7 +254,8 @@
 		},
 		{
 			"root": "pages/user",
-			"pages": [{
+			"pages": [
+				{
 					"path": "faq",
 					"style": {
 						"navigationBarTitleText": "常见问题",
@@ -336,7 +338,6 @@
 					"style": {
 						"navigationBarTitleText": "提现",
 						"navigationStyle": "custom"
-
 					}
 				},
 				{
@@ -359,7 +360,8 @@
 		},
 		{
 			"root": "pages/order",
-			"pages": [{
+			"pages": [
+				{
 					"path": "mallOrder/orderList",
 					"style": {
 						"navigationBarTitleText": "商城订单列表",
@@ -404,28 +406,28 @@
 						"navigationBarTitleText": "物流信息"
 					}
 				},
-				{
-					"path": "onlineOrder/list",
-					"style": {
-						"navigationBarTitleText": "在线订单",
-						"enablePullDownRefresh": true,
-						"navigationBarBackgroundColor": "#f7f7f7"
-					}
-				},
-				{
-					"path": "onlineOrder/details",
-					"style": {
-						"navigationBarTitleText": "在线订单详情"
-					}
-				},
-				{
-					"path": "queuingOrders/list",
-					"style": {
-						"navigationBarTitleText": "排队订单",
-						"enablePullDownRefresh": true,
-						"navigationBarBackgroundColor": "#f7f7f7"
-					}
-				},
+				// {
+				// 	"path": "onlineOrder/list",
+				// 	"style": {
+				// 		"navigationBarTitleText": "在线订单",
+				// 		"enablePullDownRefresh": true,
+				// 		"navigationBarBackgroundColor": "#f7f7f7"
+				// 	}
+				// },
+				// {
+				// 	"path": "onlineOrder/details",
+				// 	"style": {
+				// 		"navigationBarTitleText": "在线订单详情"
+				// 	}
+				// },
+				// {
+				// 	"path": "queuingOrders/list",
+				// 	"style": {
+				// 		"navigationBarTitleText": "排队订单",
+				// 		"enablePullDownRefresh": true,
+				// 		"navigationBarBackgroundColor": "#f7f7f7"
+				// 	}
+				// },
 				{
 					"path": "ConfirmOrder",
 					"style": {
@@ -464,133 +466,10 @@
 				}
 			]
 		},
-		{
-			"root": "pages/agencyCenter",
-			"pages": [{
-					"path": "regionalAgent",
-					"style": {
-						"navigationBarTitleText": "区域代理"
-					}
-				},
-				{
-					"path": "joinAgent",
-					"style": {
-						"navigationBarTitleText": "加入代理"
-					}
-				},
-				{
-					"path": "signature",
-					"style": {
-						"navigationBarTitleText": "签名"
-					}
-				},
-				{
-					"path": "accountCode/apply",
-					"style": {
-						"navigationBarTitleText": "账户码申请"
-					}
-				},
-				{
-					"path": "submitView",
-					"style": {
-						"navigationBarTitleText": "区域代理",
-						"navigationBarBackgroundColor": "#f7f7f7"
-					}
-				},
-				{
-					"path": "index",
-					"style": {
-						"navigationBarTitleText": "代理中心",
-						"navigationBarBackgroundColor": "#f7f7f7",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "agentReview/list",
-					"style": {
-						"navigationBarTitleText": "代理审核管理",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "agentReview/details",
-					"style": {
-						"navigationBarTitleText": "详情"
-					}
-				},
-				{
-					"path": "accountCode/list",
-					"style": {
-						"navigationBarTitleText": "账户码管理",
-						"navigationBarBackgroundColor": "#f7f7f7",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "accountCode/applyRecord",
-					"style": {
-						"navigationBarTitleText": "申请记录",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "accountCode/review",
-					"style": {
-						"navigationBarTitleText": "审核管理",
-						"navigationBarBackgroundColor": "#f7f7f7",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "storeReview/list",
-					"style": {
-						"navigationBarTitleText": "店铺审核",
-						"navigationBarBackgroundColor": "#f7f7f7",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "storeReview/details",
-					"style": {
-						"navigationBarTitleText": "店铺详情",
-						"navigationBarBackgroundColor": "#f7f7f7",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "promotionShop",
-					"style": {
-						"navigationBarTitleText": "推广店铺",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "partner",
-					"style": {
-						"navigationBarTitleText": "代理伙伴",
-						"navigationBarBackgroundColor": "#f7f7f7",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "revenue/list",
-					"style": {
-						"navigationBarTitleText": "代理收益",
-						"navigationBarBackgroundColor": "#f7f7f7",
-						"enablePullDownRefresh": true
-					}
-				},
-				{
-					"path": "poster",
-					"style": {
-						"navigationBarTitleText": "邀请码"
-					}
-				}
-			]
-		},
 		{
 			"root": "pages/set",
-			"pages": [{
+			"pages": [
+				{
 					"path": "index",
 					"style": {
 						"navigationBarTitleText": "设置"
@@ -645,12 +524,19 @@
 		"iconWidth": "24px",
 		"spacing": "0px",
 		"height": "55px",
-		"list": [{
+		"list": [
+			{
 				"pagePath": "pages/tabtar/home",
 				"iconPath": "static/shop_tabbar_01.png",
 				"selectedIconPath": "static/shop_select_tabbar_01.png",
 				"text": "首页"
 			},
+			{
+				"pagePath": "pages/goodsType/index",
+				"iconPath": "static/shop_tabbar_01.png",
+				"selectedIconPath": "static/shop_select_tabbar_01.png",
+				"text": "分类"
+			},
 			{
 				"pagePath": "pages/tabtar/shoppingCart",
 				"iconPath": "static/shop_tabbar_02.png",

+ 12 - 12
pages/tabtar/personalCenter.vue

@@ -99,7 +99,7 @@
               />
               <view class="mine-content-order-item-title">商城订单</view>
             </view>
-            <view class="order-item-line"> </view>
+            <!-- <view class="order-item-line"> </view>
             <view
               class="mine-content-order-item"
               @click.stop="goJump('/pages/order/onlineOrder/list', true)"
@@ -122,7 +122,7 @@
                 alt=""
               />
               <view class="mine-content-order-item-title">排队订单</view>
-            </view>
+            </view> -->
           </view>
         </view>
       </view>
@@ -253,14 +253,14 @@ const toolsList = ref([
     idNeedLogin: true,
     isPage: true,
   },
-  {
-    label: "代理中心",
-    icon: "/personalCenter/app_icon6.png",
-    url: "/pages/agencyCenter/index",
-    idNeedLogin: true,
-    isPage: true,
-    isAgent: true, // 是否为代理商才显示
-  },
+  // {
+  //   label: "代理中心",
+  //   icon: "/personalCenter/app_icon6.png",
+  //   url: "/pages/agencyCenter/index",
+  //   idNeedLogin: true,
+  //   isPage: true,
+  //   isAgent: true, // 是否为代理商才显示
+  // },
   {
     label: "官方客服",
     icon: "/personalCenter/app_icon7.png",
@@ -302,9 +302,9 @@ const toolsList = ref([
 const isSign = ref(false);
 const tabBg = ref("none");
 onPageScroll((e) => {
-  console.log(e.scrollTop)
+  // console.log(e.scrollTop)
   if (e.scrollTop > 10) {
-    tabBg.value = "#2d79f8";
+    tabBg.value = "#ffffff";
   } else {
     tabBg.value = "none";
   }