用户体系优化修复测试问题

common/config/common.js

@@ -55,7 +55,6 @@ const utils = {
 		return bankNum
 	},
 	checkData:function(value){
-		console.log(value)
 		let data;
 		if(value == null || value ==""){
 			data = ''

common/config/register-json.js

@@ -0,0 +1,9 @@
+const beautyList = [{value:'1',name:'诊所'},{value:'2',name:'门诊'},{value:'3',name:'医院'}]
+const mentuzCampNullList = [{value:'1',name:'整形'},{value:'2',name:'轻医美'},{value:'3',name:'皮肤科'}]
+const medicaCampNullList = [{value:'1',name:'美容'},{value:'2',name:'美体'},{value:'3',name:'美发'},{value:'4',name:'皮肤管理'},{value:'5',name:'光电'},{value:'6',name:'综合类'},{value:'7',name:'中医养生'},{value:'8',name:'spa'}]
+
+module.exports = {
+	beautyList,
+	mentuzCampNullList,
+	medicaCampNullList
+}

components/module/listTemplate/buyagainList.vue

@@ -11,8 +11,7 @@
 						<text class="list-details-miniQuantity">起订量：{{item.minBuyNumber}}</text>
 						<view class="list-details-price" v-if="item.price1TextFlag == 1">
 							<view class="list-none">
-								<view class="price-small">该商品尚未公开价格</view>
-								<view class="price-small">购买请致电：0755-22907771</view>
+								<view class="price-small">未公开价格</view>
 							</view>
 						</view>
 						<view class="list-details-price" v-else>

components/module/listTemplate/commodityList.vue

@@ -15,8 +15,7 @@
 						</view>
 						<view class="list-price" v-else>
 							<view class="price-larger" v-if="item.price1TextFlag == '1'">
-								<text class="txt">该商品尚未公开价格</text>
-								<text class="txt">购买请致电：0755-22907771</text>
+								<text class="txt">未公开价格</text>
 							</view>
 							<text v-else>￥<text class="price-larger">{{item.retailPrice?item.retailPrice.toFixed(2):'0.00'}}</text></text>
 						</view>

components/module/listTemplate/immediatelyList.vue

@@ -25,8 +25,7 @@
 						<text class="list-details-miniQuantity">起订量：{{item.minBuyNumber}}</text>
 						<view class="list-details-price" v-if="item.price1TextFlag == 1">
 							<view class="list-none">
-								<view class="price-small">该商品尚未公开价格</view>
-								<view class="price-small">购买请致电：0755-22907771</view>
+								<view class="price-small">未公开价格</view>
 							</view>
 						</view>
 						<view class="list-details-price" v-else>

components/module/listTemplate/productList.vue

@@ -11,8 +11,7 @@
 						<text class="list-details-miniQuantity">起订量：{{item.minBuyNumber}}</text>
 						<view class="list-details-price" v-if="item.price1TextFlag == 1">
 							<view class="list-none">
-								<view class="price-small">该商品尚未公开价格</view>
-								<view class="price-small">购买请致电：0755-22907771</view>
+								<view class="price-small">未公开价格</view>
 							</view>
 						</view>
 						<view class="list-details-price" v-else>

json.js

@@ -1,1369 +1,8 @@
-
-/* 底部服务分类导航 */
-const footTavList =[
-	{src:"/static/temp/server1@2x.png",text:"会员优惠"},
-	{src:"/static/temp/server2@2x.png",text:"售后无忧"},
-	{src:"/static/temp/server3@2x.png",text:"购物须知"},
-	{src:"/static/temp/server4@2x.png",text:"联系我们"}
-]
-
-const cateList = [
-		{id: 1,name: '数码/手机'},
-		{id: 2,name: '礼品拿/鲜花'},
-		{id: 3,name: '服装'},
-		{id: 4,name: '婴幼儿'},
-		{id: 5,name: '生鲜'},
-		{id: 6,pid: 1,name: '手机通讯'},
-		{id: 7,pid: 1,name: '商务手机'},
-		{id: 8,pid: 6,name: '全面屏手机',picture: 'http://img4.imgtn.bdimg.com/it/u=156249486,618039268&fm=26&gp=0.jpg'},
-		{id: 9,pid: 6,name: '游戏手机',picture: 'http://img4.imgtn.bdimg.com/it/u=156249486,618039268&fm=26&gp=0.jpg'},
-		{id: 10,pid: 6,name: '老人机',picture: 'http://img4.imgtn.bdimg.com/it/u=156249486,618039268&fm=26&gp=0.jpg'},
-		{id: 11,pid: 6,name: '拍照手机',picture: 'http://img4.imgtn.bdimg.com/it/u=156249486,618039268&fm=26&gp=0.jpg'},
-		{id: 12,pid: 7,name: '女性手机',picture: 'http://img4.imgtn.bdimg.com/it/u=156249486,618039268&fm=26&gp=0.jpg'},
-		{id: 14,pid: 7,name: '合约机',picture: 'http://img4.imgtn.bdimg.com/it/u=156249486,618039268&fm=26&gp=0.jpg'},
-		{id: 15,pid: 7,name: '选好卡',picture: 'http://img4.imgtn.bdimg.com/it/u=156249486,618039268&fm=26&gp=0.jpg'},
-		{id: 16,pid: 7,name: '办套餐',picture: 'http://img4.imgtn.bdimg.com/it/u=156249486,618039268&fm=26&gp=0.jpg'},
-		{id: 17,pid: 2,name: '礼品',},
-		{id: 18,pid: 2,name: '鲜花',},
-		{id: 19,pid: 17,name: '公益摆件',picture: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3905271747,782039201&fm=26&gp=0.jpg'},
-		{id: 20,pid: 17,name: '创意礼品',picture: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=3905271747,782039201&fm=26&gp=0.jpg'},
-		{id: 21,pid: 18,name: '鲜花',picture: 'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=2225739817,2167164974&fm=11&gp=0.jpg'},
-		{id: 22,pid: 18,name: '每周一花',picture: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=181128911,3496603553&fm=26&gp=0.jpg'},
-		{id: 23,pid: 18,name: '卡通花束',picture: 'https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=2434760217,4114675020&fm=26&gp=0.jpg'},
-		{id: 24,pid: 18,name: '永生花',picture: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1987635208,698824670&fm=26&gp=0.jpg'},
-		{id: 25,pid: 3,name: '男装'},
-		{id: 26,pid: 3,name: '女装'},
-		{id: 27,pid: 25,name: '男士T恤',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2048096982,2616217980&fm=26&gp=0.jpg'},
-		{id: 28,pid: 25,name: '男士外套',picture: 'https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3726494558,3650840727&fm=26&gp=0.jpg'},
-		{id: 29,pid: 25,name: '裙装',picture: 'https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3425405217,1433679344&fm=26&gp=0.jpg'},
-		{id: 30,pid: 26,name: 'T恤',picture: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1343452775,57135293&fm=26&gp=0.jpg'},
-		{id: 31,pid: 26,name: '上装',picture: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1343452775,57135293&fm=26&gp=0.jpg'},
-		{id: 32,pid: 26,name: '下装',picture: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1343452775,57135293&fm=26&gp=0.jpg'},
-		{id: 33,pid: 4,name: '奶粉',},
-		{id: 34,pid: 4,name: '营养辅食',},
-		{id: 35,pid: 4,name: '童装',},
-		{id: 36,pid: 4,name: '喂养用品',},
-		{id: 37,pid: 33,name: '有机奶粉',picture: 'https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=1413727550,4078612979&fm=26&gp=0.jpg'},
-		{id: 38,pid: 33,name: '果泥/果汁',picture: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2339253510,3704143522&fm=26&gp=0.jpg'},
-		{id: 39,pid: 34,name: '面条/粥',picture: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=2239876224,566971426&fm=26&gp=0.jpg'},
-		{id: 40,pid: 34,name: '婴童衣橱',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3226296874,2486695382&fm=11&gp=0.jpg'},
-		{id: 41,pid: 35,name: '吸奶器',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3226296874,2486695382&fm=11&gp=0.jpg'},
-		{id: 42,pid: 35,name: '儿童餐具',picture: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1894888785,2968170247&fm=26&gp=0.jpg'},
-		{id: 43,pid: 36,name: '牙胶安抚',picture: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1894888785,2968170247&fm=26&gp=0.jpg'},
-		{id: 44,pid: 36,name: '围兜',picture: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1894888785,2968170247&fm=26&gp=0.jpg'},
-		{id: 45,pid: 5,name: '海鲜'},
-		{id: 46,pid: 5,name: '生鲜'},
-		{id: 47,pid: 45,name: '男士T恤',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2048096982,2616217980&fm=26&gp=0.jpg'},
-		{id: 48,pid: 45,name: '男士外套',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2048096982,2616217980&fm=26&gp=0.jpg'},
-		{id: 49,pid: 45,name: '裙装',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2048096982,2616217980&fm=26&gp=0.jpg'},
-		{id: 50,pid: 46,name: 'T恤',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2048096982,2616217980&fm=26&gp=0.jpg'},
-		{id: 51,pid: 46,name: '上装',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2048096982,2616217980&fm=26&gp=0.jpg'},
-		{id: 52,pid: 46,name: '下装',picture: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2048096982,2616217980&fm=26&gp=0.jpg'},
-]
-
-const categoryList =[
-    {
-      "bigTypeID": 1000,
-      "name": "功效性产品",
-      "bigTypeCode": "GXXC",
-      "validFlag": "1",
-      "sortIndex": 100,
-      "seo": null,
-      "displayOnHomePageFlag": null,
-      "smalltypeList": [
-        {
-          "smallTypeID": 1000,
-          "bigTypeID": 1000,
-          "name": "院用产品",
-          "smallTypeCode": "YYCP",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1000,
-              "smallTypeID": 1000,
-              "name": "高端护理",
-              "tinyTypeCode": "GDHL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 2
-            },
-            {
-              "tinyTypeID": 1001,
-              "smallTypeID": 1000,
-              "name": "导入液",
-              "tinyTypeCode": "DRY",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 3
-            },
-            {
-              "tinyTypeID": 1002,
-              "smallTypeID": 1000,
-              "name": "术后护理类",
-              "tinyTypeCode": "SHHL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1001,
-          "bigTypeID": 1000,
-          "name": "客装产品",
-          "smallTypeCode": "KZCP",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1003,
-              "smallTypeID": 1001,
-              "name": "清洁系列",
-              "tinyTypeCode": "QJXL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1004,
-              "smallTypeID": 1001,
-              "name": "精油系列",
-              "tinyTypeCode": "JYXL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1005,
-              "smallTypeID": 1001,
-              "name": "面膜系列",
-              "tinyTypeCode": "MMXL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1006,
-              "smallTypeID": 1001,
-              "name": "补水系列",
-              "tinyTypeCode": "BSXL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1007,
-              "smallTypeID": 1001,
-              "name": "美白系列",
-              "tinyTypeCode": "MBXL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1008,
-              "smallTypeID": 1001,
-              "name": "控油祛痘",
-              "tinyTypeCode": "KYXL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1009,
-              "smallTypeID": 1001,
-              "name": "抗衰系列",
-              "tinyTypeCode": "KSXL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1010,
-              "smallTypeID": 1001,
-              "name": "彩妆系列",
-              "tinyTypeCode": "CZXL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1011,
-              "smallTypeID": 1001,
-              "name": "套组",
-              "tinyTypeCode": "TZ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1012,
-              "smallTypeID": 1001,
-              "name": "修复系列",
-              "tinyTypeCode": "XFXL",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1002,
-          "bigTypeID": 1000,
-          "name": "院护套盒",
-          "smallTypeCode": "YHTH",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1013,
-              "smallTypeID": 1002,
-              "name": "面部套盒",
-              "tinyTypeCode": "MBTH",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1014,
-              "smallTypeID": 1002,
-              "name": "眼部套盒",
-              "tinyTypeCode": "YBTH",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1015,
-              "smallTypeID": 1002,
-              "name": "胸部套盒",
-              "tinyTypeCode": "XBTH",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1016,
-              "smallTypeID": 1002,
-              "name": "私密套盒",
-              "tinyTypeCode": "SMTH",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1017,
-              "smallTypeID": 1002,
-              "name": "身体套盒",
-              "tinyTypeCode": "STTH",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1018,
-              "smallTypeID": 1002,
-              "name": "精油套盒",
-              "tinyTypeCode": "JYTH",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1019,
-              "smallTypeID": 1002,
-              "name": "艾灸套盒",
-              "tinyTypeCode": "AJTH",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1003,
-          "bigTypeID": 1000,
-          "name": "针剂/线材",
-          "smallTypeCode": "ZJXC",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1020,
-              "smallTypeID": 1003,
-              "name": "针剂",
-              "tinyTypeCode": "ZJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1021,
-              "smallTypeID": 1003,
-              "name": "线材",
-              "tinyTypeCode": "XC",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "bigTypeID": 1001,
-      "name": "轻光电",
-      "bigTypeCode": "QGD",
-      "validFlag": "1",
-      "sortIndex": 90,
-      "seo": null,
-      "displayOnHomePageFlag": null,
-      "smalltypeList": [
-        {
-          "smallTypeID": 1004,
-          "bigTypeID": 1001,
-          "name": "面部仪器",
-          "smallTypeCode": "MBYQ",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1022,
-              "smallTypeID": 1004,
-              "name": "皮肤检测(仪)",
-              "tinyTypeCode": "PFJC",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1023,
-              "smallTypeID": 1004,
-              "name": "小气泡清洁仪",
-              "tinyTypeCode": "XQPQ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1024,
-              "smallTypeID": 1004,
-              "name": "水光仪器",
-              "tinyTypeCode": "SGYQ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1025,
-              "smallTypeID": 1004,
-              "name": "导入仪",
-              "tinyTypeCode": "DRY",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1026,
-              "smallTypeID": 1004,
-              "name": "舒敏祛痘",
-              "tinyTypeCode": "SMQD",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1027,
-              "smallTypeID": 1004,
-              "name": "家用小仪器",
-              "tinyTypeCode": "JYXY",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1028,
-              "smallTypeID": 1004,
-              "name": "多功能机",
-              "tinyTypeCode": "DGNJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1005,
-          "bigTypeID": 1001,
-          "name": "身体仪器",
-          "smallTypeCode": "STYQ",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1029,
-              "smallTypeID": 1005,
-              "name": "紧致塑形",
-              "tinyTypeCode": "JZSX",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1030,
-              "smallTypeID": 1005,
-              "name": "理疗仪",
-              "tinyTypeCode": "LLY",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "bigTypeID": 1002,
-      "name": "重光电",
-      "bigTypeCode": "ZGD",
-      "validFlag": "1",
-      "sortIndex": 80,
-      "seo": null,
-      "displayOnHomePageFlag": null,
-      "smalltypeList": [
-        {
-          "smallTypeID": 1006,
-          "bigTypeID": 1002,
-          "name": "面部仪器",
-          "smallTypeCode": "MBYQ",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1031,
-              "smallTypeID": 1006,
-              "name": "激光/光子",
-              "tinyTypeCode": "JGGZ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1032,
-              "smallTypeID": 1006,
-              "name": "脸部抗衰",
-              "tinyTypeCode": "LBKS",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1007,
-          "bigTypeID": 1002,
-          "name": "身体仪器",
-          "smallTypeCode": "STYQ",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1033,
-              "smallTypeID": 1007,
-              "name": "减脂/溶脂塑形",
-              "tinyTypeCode": "JZRZ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1034,
-              "smallTypeID": 1007,
-              "name": "脱毛嫩肤",
-              "tinyTypeCode": "TMNF",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1035,
-              "smallTypeID": 1007,
-              "name": "祛妊娠纹",
-              "tinyTypeCode": "QRSW",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1036,
-              "smallTypeID": 1007,
-              "name": "胸部抗衰",
-              "tinyTypeCode": "XBKS",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1037,
-              "smallTypeID": 1007,
-              "name": "私密抗衰",
-              "tinyTypeCode": "SMKS",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "bigTypeID": 1003,
-      "name": "耗材配件",
-      "bigTypeCode": "HCPJ",
-      "validFlag": "1",
-      "sortIndex": 70,
-      "seo": null,
-      "displayOnHomePageFlag": null,
-      "smalltypeList": [
-        {
-          "smallTypeID": 1008,
-          "bigTypeID": 1003,
-          "name": "产品配套",
-          "smallTypeCode": "CPPT",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1038,
-              "smallTypeID": 1008,
-              "name": "水光仪器耗材",
-              "tinyTypeCode": "SGYQ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1039,
-              "smallTypeID": 1008,
-              "name": "小气泡耗材",
-              "tinyTypeCode": "XQPH",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1040,
-              "smallTypeID": 1008,
-              "name": "小仪器耗材",
-              "tinyTypeCode": "XYQH",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1009,
-          "bigTypeID": 1003,
-          "name": "配件",
-          "smallTypeCode": "PJ",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1041,
-              "smallTypeID": 1009,
-              "name": "探头",
-              "tinyTypeCode": "TT",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1042,
-              "smallTypeID": 1009,
-              "name": "滤玻片",
-              "tinyTypeCode": "LBP",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1043,
-              "smallTypeID": 1009,
-              "name": "手具",
-              "tinyTypeCode": "SJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1010,
-          "bigTypeID": 1003,
-          "name": "凝胶类/膏类",
-          "smallTypeCode": "NJLG",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1044,
-              "smallTypeID": 1010,
-              "name": "麻膏",
-              "tinyTypeCode": "MG",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1045,
-              "smallTypeID": 1010,
-              "name": "耦合剂",
-              "tinyTypeCode": "OHJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1046,
-              "smallTypeID": 1010,
-              "name": "射频凝胶/射频膏",
-              "tinyTypeCode": "SPNJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "bigTypeID": 1004,
-      "name": "会所常用品",
-      "bigTypeCode": "HSCY",
-      "validFlag": "1",
-      "sortIndex": 60,
-      "seo": null,
-      "displayOnHomePageFlag": null,
-      "smalltypeList": [
-        {
-          "smallTypeID": 1011,
-          "bigTypeID": 1004,
-          "name": "常用耗材",
-          "smallTypeCode": "CYHC",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1047,
-              "smallTypeID": 1011,
-              "name": "洁面巾",
-              "tinyTypeCode": "JMJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1048,
-              "smallTypeID": 1011,
-              "name": "化妆棉",
-              "tinyTypeCode": "HZM",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1049,
-              "smallTypeID": 1011,
-              "name": "压缩面膜",
-              "tinyTypeCode": "YSMM",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1050,
-              "smallTypeID": 1011,
-              "name": "内裤",
-              "tinyTypeCode": "NK",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1051,
-              "smallTypeID": 1011,
-              "name": "口罩",
-              "tinyTypeCode": "KZ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1052,
-              "smallTypeID": 1011,
-              "name": "保鲜膜",
-              "tinyTypeCode": "BXM",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1053,
-              "smallTypeID": 1011,
-              "name": "棉签",
-              "tinyTypeCode": "MQ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1054,
-              "smallTypeID": 1011,
-              "name": "浴帽",
-              "tinyTypeCode": "YM",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1055,
-              "smallTypeID": 1011,
-              "name": "床单",
-              "tinyTypeCode": "CD",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1056,
-              "smallTypeID": 1011,
-              "name": "手套",
-              "tinyTypeCode": "ST",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1057,
-              "smallTypeID": 1011,
-              "name": "头垫",
-              "tinyTypeCode": "TD",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1058,
-              "smallTypeID": 1011,
-              "name": "拖鞋",
-              "tinyTypeCode": "TX",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1059,
-              "smallTypeID": 1011,
-              "name": "美发",
-              "tinyTypeCode": "MF",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1060,
-              "smallTypeID": 1011,
-              "name": "花茶",
-              "tinyTypeCode": "HC",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1061,
-              "smallTypeID": 1011,
-              "name": "其他",
-              "tinyTypeCode": "QT",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1012,
-          "bigTypeID": 1004,
-          "name": "泡浴类",
-          "smallTypeCode": "PYL",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1062,
-              "smallTypeID": 1012,
-              "name": "瑶浴包",
-              "tinyTypeCode": "YYB",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1063,
-              "smallTypeID": 1012,
-              "name": "沐足袋",
-              "tinyTypeCode": "MZD",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1064,
-              "smallTypeID": 1012,
-              "name": "沐浴袋",
-              "tinyTypeCode": "MYD",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1065,
-              "smallTypeID": 1012,
-              "name": "脸盆袋",
-              "tinyTypeCode": "LPD",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1066,
-              "smallTypeID": 1012,
-              "name": "擦脚巾",
-              "tinyTypeCode": "CJJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1067,
-              "smallTypeID": 1012,
-              "name": "木桶",
-              "tinyTypeCode": "MT",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1068,
-              "smallTypeID": 1012,
-              "name": "桑拿服",
-              "tinyTypeCode": "SNF",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1069,
-              "smallTypeID": 1012,
-              "name": "其他",
-              "tinyTypeCode": "QT",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1013,
-          "bigTypeID": 1004,
-          "name": "美容家具",
-          "smallTypeCode": "MRJJ",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1070,
-              "smallTypeID": 1013,
-              "name": "美容椅",
-              "tinyTypeCode": "MRY",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1071,
-              "smallTypeID": 1013,
-              "name": "美容推车",
-              "tinyTypeCode": "MRTC",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1072,
-              "smallTypeID": 1013,
-              "name": "美容床",
-              "tinyTypeCode": "MRC",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1014,
-          "bigTypeID": 1004,
-          "name": "布草类",
-          "smallTypeCode": "BCL",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1073,
-              "smallTypeID": 1014,
-              "name": "美容师服",
-              "tinyTypeCode": "MRSF",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1074,
-              "smallTypeID": 1014,
-              "name": "浴袍",
-              "tinyTypeCode": "YP",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1075,
-              "smallTypeID": 1014,
-              "name": "毛巾",
-              "tinyTypeCode": "MJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1076,
-              "smallTypeID": 1014,
-              "name": "浴巾",
-              "tinyTypeCode": "YJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1077,
-              "smallTypeID": 1014,
-              "name": "方巾",
-              "tinyTypeCode": "FJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1078,
-              "smallTypeID": 1014,
-              "name": "床单",
-              "tinyTypeCode": "CD",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1079,
-              "smallTypeID": 1014,
-              "name": "四件套",
-              "tinyTypeCode": "SJT",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1015,
-          "bigTypeID": 1004,
-          "name": "理疗养生",
-          "smallTypeCode": "LLYS",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1080,
-              "smallTypeID": 1015,
-              "name": "艾条",
-              "tinyTypeCode": "AT",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1081,
-              "smallTypeID": 1015,
-              "name": "艾柱",
-              "tinyTypeCode": "AZ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1082,
-              "smallTypeID": 1015,
-              "name": "理疗工具",
-              "tinyTypeCode": "LLGJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1083,
-              "smallTypeID": 1015,
-              "name": "艾灸仪",
-              "tinyTypeCode": "AJY",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1084,
-              "smallTypeID": 1015,
-              "name": "其他",
-              "tinyTypeCode": "QT",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1016,
-          "bigTypeID": 1004,
-          "name": "美容工具",
-          "smallTypeCode": "MRGJ",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1085,
-              "smallTypeID": 1016,
-              "name": "面膜刷",
-              "tinyTypeCode": "MMS",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1086,
-              "smallTypeID": 1016,
-              "name": "面膜碗",
-              "tinyTypeCode": "MMW",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1087,
-              "smallTypeID": 1016,
-              "name": "刮痧板",
-              "tinyTypeCode": "GSB",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1088,
-              "smallTypeID": 1016,
-              "name": "小工具",
-              "tinyTypeCode": "XGJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1017,
-          "bigTypeID": 1004,
-          "name": "美容仪",
-          "smallTypeCode": "MRY",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1089,
-              "smallTypeID": 1017,
-              "name": "冷热喷",
-              "tinyTypeCode": "LRP",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1090,
-              "smallTypeID": 1017,
-              "name": "冷光灯",
-              "tinyTypeCode": "LGD",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1091,
-              "smallTypeID": 1017,
-              "name": "超声波",
-              "tinyTypeCode": "CSB",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1092,
-              "smallTypeID": 1017,
-              "name": "其他",
-              "tinyTypeCode": "QT",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "bigTypeID": 1005,
-      "name": "健康管理",
-      "bigTypeCode": "JKGL",
-      "validFlag": "1",
-      "sortIndex": 50,
-      "seo": null,
-      "displayOnHomePageFlag": null,
-      "smalltypeList": [
-        {
-          "smallTypeID": 1018,
-          "bigTypeID": 1005,
-          "name": "设备",
-          "smallTypeCode": "SB",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1093,
-              "smallTypeID": 1018,
-              "name": "肠道运动机",
-              "tinyTypeCode": "CDYD",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            },
-            {
-              "tinyTypeID": 1094,
-              "smallTypeID": 1018,
-              "name": "resolady",
-              "tinyTypeCode": "RESO",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        },
-        {
-          "smallTypeID": 1019,
-          "bigTypeID": 1005,
-          "name": "产品",
-          "smallTypeCode": "CP1",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1095,
-              "smallTypeID": 1019,
-              "name": "益生菌",
-              "tinyTypeCode": "YSJ",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "bigTypeID": 1006,
-      "name": "其它",
-      "bigTypeCode": "QT1",
-      "validFlag": "1",
-      "sortIndex": 50,
-      "seo": null,
-      "displayOnHomePageFlag": null,
-      "smalltypeList": [
-        {
-          "smallTypeID": 1020,
-          "bigTypeID": 1006,
-          "name": "其它",
-          "smallTypeCode": "QT",
-          "validFlag": "1",
-          "sortIndex": 0,
-          "seo": null,
-          "displayOnHomePageFlag": null,
-          "tinytypeList": [
-            {
-              "tinyTypeID": 1096,
-              "smallTypeID": 1020,
-              "name": "其它",
-              "tinyTypeCode": "QT11",
-              "icon": "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2179202400,1693500600&fm=26&gp=0.jpg",
-              "validFlag": "1",
-              "seo": null,
-              "sortIndex": 0
-            }
-          ]
-        }
-      ]
-    }
-]
+const beautyList = [{value:'1',name:'诊所'},{value:'2',name:'门诊'},{value:'3',name:'医院'}]
+const mentuzList = [{value:'1',name:'整形'},{value:'2',name:'轻医美'},{value:'3',name:'皮肤科'}]
+const medicaList = [{value:'1',name:'美容'},{value:'2',name:'美体'},{value:'3',name:'美发'},{value:'4',name:'皮肤管理'},{value:'5',name:'光电'},{value:'6',name:'综合类'},{value:'7',name:'中医养生'},{value:'8',name:'spa'}]
 export default{
-	footTavList,
-	cateList,
-	categoryList
+	beautyList,
+	mentuzList,
+	medicaList
 }

market/pages/login/apply.vue

@@ -70,7 +70,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="clubContact" placeholder="请填写社会统一信用代码" maxlength="16"/>
+					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="16"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -223,6 +223,7 @@
 <script>
 import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/config/register-json.js' //本地数据
 	import { organizationUpdateModifyInfo  } from "@/api/use.js"
 	import { uploadFileImage } from "@/api/utils.js" 
 	import { sellerClubUpdate } from "@/api/seller.js" 
@@ -266,7 +267,9 @@ import { mapMutations } from 'vuex';
 				firstClubType:'',		//机构类型
 				isOrganizationType:0,
 				organizationTypeText:'请选择机构类型',
-				beautyList:[{value:'1',name:'诊所'},{value:'2',name:'门诊'},{value:'3',name:'医院'}],
+				beautyList:beautyList,
+				mentuzCampNullList:mentuzCampNullList,
+				medicaCampNullList:medicaCampNullList,
 				mentuzCampList:[],
 				medicaCampList:[],
 				typtIndex:0,
@@ -409,7 +412,6 @@ import { mapMutations } from 'vuex';
 						info : this.companyPprofile,
 						status:this.status
 				}
-				console.log(params)
 				sellerClubUpdate(params).then(response =>{
 					this.$util.msg('提交成功',2000,true,'success')
 					setTimeout(()=>{
@@ -427,7 +429,6 @@ import { mapMutations } from 'vuex';
 				this.$refs.mpvueCityPicker.show()
 			},
 			onConfirm(e) {
-				console.log('地址',e);
 				this.addressData.address = e.name;
 				this.addressData.townID = e.townCode;
 				this.addressData.cityID = e.cityCode;
@@ -504,7 +505,6 @@ import { mapMutations } from 'vuex';
 			
 			},
 			bindPickerChange2(e) {
-				console.log('picker携带值为：' + e.target.value)
 				this.typtIndex = e.target.value
 				this.isOrganizationType = e.target.value
 			},
@@ -525,12 +525,10 @@ import { mapMutations } from 'vuex';
 			chooseMaleLike(e){
 				this.isMainproCheck = true
 				this.mainpro = this.checkLikes(e,this.mentuzCampList)
-				console.log(this.mainpro)
 			},
 			chooseMaleLikes(e){
 				this.isMainproCheck = true
 				this.mainpro = this.checkLikes(e,this.medicaCampList)
-				console.log(this.mainpro)
 			},
 			checkLikes(e,list){
 				let items = list
@@ -584,7 +582,7 @@ import { mapMutations } from 'vuex';
 			},
 			showOpenError(){//顶部审核信息详情
 				this.isOpenError = !this.isOpenError
-			},
+			}
 		},
 		onShow() {
 			if(this.isPreviewImage){

market/pages/login/information.vue

@@ -233,10 +233,10 @@
 <script>
 	import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/config/register-json.js' //本地数据
 	import { organizationUpdateModifyInfo } from "@/api/use.js"
 	import { uploadFileImage } from "@/api/utils.js" 
 	import { sellerClubUpdate } from "@/api/seller.js" 
-	var self;
 	export default{
 		components:{
 			mpvueCityPicker
@@ -275,7 +275,9 @@
 				firstClubType:'',		//机构类型
 				isOrganizationType:0,
 				organizationTypeText:'请选择机构类型',
-				beautyList:[{value:'1',name:'诊所'},{value:'2',name:'门诊'},{value:'3',name:'医院'}],
+				beautyList:beautyList,
+				mentuzCampNullList:mentuzCampNullList,
+				medicaCampNullList:medicaCampNullList,
 				mentuzCampList:[],
 				medicaCampList:[],
 				typtIndex:0,
@@ -358,11 +360,16 @@
 							this.isOrganizationType = 0
 							break;
 					}	
-					if(organizationClub.mainpro!=""){
+					if(organizationClub.mainpro == "" || organizationClub.mainpro == null){
+						this.mentuzCampList = this.mentuzCampNullList
+						this.medicaCampList = this.medicaCampNullList
+					}else{
 						if(this.firstClubType == '1'){
 							this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
+							this.medicaCampList = this.medicaCampNullList
 						}else{
 							this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
+							this.mentuzCampList = this.mentuzCampNullList
 						}
 					}
 					//机构类型

market/pages/order/order-details.vue

@@ -97,7 +97,7 @@
 			if(this.shareType ==='share'){
 				this.listType = 0
 				this.isOrderShare = true
-			}else if(option.type === 'confim'){
+			}else if(option.type === 'confim' || option.type === 'search'){
 				this.listType = 0
 			}else{
 				this.listType = option.listType
@@ -160,9 +160,9 @@
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							if(this.shareType ==='share'){
-								this.$api.navigateTo('/market/pages/user/user')
+								this.$api.navigateTo('/market/pages/index/index')
 							}else{
-								this.$api.navigateTo(`/market/pages/order/order-list?type=detele&listType=0`)
+								this.$api.navigateTo(`/market/pages/order/order-list?type=detele&listType=${this.listType}`)
 							}
 						},500)
 					}).catch(response =>{

market/pages/order/order-history.vue

@@ -152,7 +152,7 @@
 				return stateText;
 			},
 			orderDetiles(id){
-				this.$api.navigateTo(`/market/pages/order/order-details?orderID=${id}`)
+				this.$api.navigateTo(`/market/pages/order/order-details?type=confim&orderID=${id}`)
 			}
 		},
 		onReachBottom() {
@@ -195,7 +195,7 @@
 			position: relative;
 			border-bottom: 1px solid #EBEBEB;
 			.list-left{
-				flex: 7.5;
+				flex: 7;
 				.list-p{
 					line-height: 58rpx;
 					font-size: $font-size-26;
@@ -219,13 +219,14 @@
 				}
 			}
 			.list-opea{
-				flex: 2.5;
+				flex: 3;
 				color: #166CE1;
 				.opea-p{
 					line-height: 70rpx;
 					font-size: $font-size-24;
 					color: #E11616;
 					text-align: right;
+					padding-right: 20rpx
 				}
 				.opea-type-dell{
 					width: 160rpx;

market/pages/search/search-order.vue

@@ -287,7 +287,7 @@
 			},
 			detail(id) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/market/pages/order/order-details?orderID=${id}`)
+				this.$api.navigateTo(`/market/pages/order/order-details?type=seacrch&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				this.handShowAlert(data)

pages/goods/product.vue

@@ -42,7 +42,7 @@
 							</view>
 							<view class="wrap-main" v-else>
 								<view class="wrap-main-pricenone" v-if="product.price1TextFlag == 1">
-									<text>该商品尚未公开价格，请联系客服购买</text>
+									<text>未公开价格</text>
 								</view>
 								<view class="wrap-main-price" v-else>
 									<view class="p-main" v-if="ladderPriceFlag == '0' || product.actStatus == 1">

pages/login/apply.vue

@@ -98,7 +98,7 @@
 			<view class="register-row clearfix">
 				<view class="register-from">
 					<view class="label">营业执照编号:</view>
-					<input class="row-input" type="text" v-model="clubContact" placeholder="请填写社会统一信用代码" maxlength="16"/>
+					<input class="row-input" type="text" v-model="socialCreditCode" placeholder="请填写社会统一信用代码" maxlength="16"/>
 				</view>
 			</view>
 			<view class="register-row clearfix">
@@ -251,9 +251,9 @@
 <script>
 import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/config/register-json.js' //本地数据
 	import { organizationUpdateModifyInfo , organizationModifyUpdate  } from "@/api/use.js"
 	import { getClubMobileCode,getClubNewMobileCode,uploadFileImage } from "@/api/utils.js" 
-	var self;
 	export default{
 		components:{
 			mpvueCityPicker
@@ -306,9 +306,11 @@ import { mapMutations } from 'vuex';
 				firstClubType:'',		//机构类型
 				isOrganizationType:0,
 				organizationTypeText:'请选择机构类型',
-				beautyList:[{value:'1',name:'诊所'},{value:'2',name:'门诊'},{value:'3',name:'医院'}],
-				mentuzCampList:[],
-				medicaCampList:[],
+				beautyList:beautyList,//医美分类
+				mentuzCampNullList:mentuzCampNullList,//医美分类
+				medicaCampNullList:medicaCampNullList,//生美分类
+				mentuzCampList:[],		//医美主营
+				medicaCampList:[],		//生美主营
 				typtIndex:0,
 				organizationType:0,
 				current:0,
@@ -390,11 +392,17 @@ import { mapMutations } from 'vuex';
 								this.isOrganizationType = 0
 								break;
 						}	
-						if(organizationClub.mainpro!=null){
+						if(organizationClub.mainpro == "" || organizationClub.mainpro == null){
+							this.mentuzCampList = this.mentuzCampNullList
+							this.medicaCampList = this.medicaCampNullList
+						}else{
 							if(this.firstClubType == '1'){
 								this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
+								this.medicaCampList = this.medicaCampNullList
+								
 							}else{
 								this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
+								this.mentuzCampList = this.mentuzCampNullList
 							}
 						}
 						//机构类型

pages/login/information.vue

@@ -270,6 +270,7 @@
 <script>
 	import { mapMutations } from 'vuex';
 	import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue'
+	import { beautyList,mentuzCampNullList,medicaCampNullList } from '@/common/config/register-json.js' //本地数据
 	import { organizationUpdateModifyInfo , organizationUpdate  } from "@/api/use.js"
 	import { getClubMobileCode,getClubNewMobileCode,uploadFileImage } from "@/api/utils.js" 
 	var self;
@@ -324,7 +325,9 @@
 				firstClubType:'',		//机构类型
 				isOrganizationType:0,
 				organizationTypeText:'请选择机构类型',
-				beautyList:[{value:'1',name:'诊所'},{value:'2',name:'门诊'},{value:'3',name:'医院'}],
+				beautyList:beautyList,
+				mentuzCampNullList:mentuzCampNullList,
+				medicaCampNullList:medicaCampNullList,
 				mentuzCampList:[],
 				medicaCampList:[],
 				typtIndex:0,
@@ -407,11 +410,16 @@
 								this.isOrganizationType = 0
 								break;
 						}	
-						if(organizationClub.mainpro!=""){
+						if(organizationClub.mainpro == "" || organizationClub.mainpro == null){
+							this.mentuzCampList = this.mentuzCampNullList
+							this.medicaCampList = this.medicaCampNullList
+						}else{
 							if(this.firstClubType == '1'){
 								this.mentuzCampList = this.setNewMainpro(organizationClub.mainpro)
+								this.medicaCampList = this.medicaCampNullList
 							}else{
 								this.medicaCampList = this.setNewMainpro(organizationClub.mainpro)
+								this.mentuzCampList = this.mentuzCampNullList
 							}
 						}
 						//机构类型

pages/search/search-order.vue

@@ -292,7 +292,7 @@
 			},
 			detail(id) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
+				this.$api.navigateTo(`/pages/user/order/order-details?type=search&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				this.handShowAlert(data)

pages/tabBar/home/home.vue

@@ -67,7 +67,7 @@
 								</view>
 								<view class="" v-if="isLogin">
 									<view class="title-none" v-if="item.price1TextFlag == '1'">
-										<text class="p big">尚未公开价格</text>
+										<text class="p big">未公开价格</text>
 									</view>
 									<view class="price tui-skeleton-rect" v-else>
 										<text class="p sm">￥</text>
@@ -195,9 +195,10 @@
 							uni.setStorageSync('sessionid','JSESSIONID='+response.data.sessionId)
 							if(response.data.userIdentity ==1){
 								this.$api.navigateTo('/market/pages/index/index')
+							}else{
+								this.getHomeInformation()
+								this.getOrganizeProducts()
 							}
-							this.getHomeInformation()
-							this.getOrganizeProducts()
 						}).catch(response =>{
 							this.isLogin = false;
 							this.logout()
@@ -261,8 +262,8 @@
 				console.log(e.detail.query)
 			},
 			showTost(){
-				this.$util.msg("正在开发中，敬请期待~",2000);
-				// this.$api.navigateTo(`/market/pages/login/login`)
+				// this.$util.msg("正在开发中，敬请期待~",2000);
+				this.$api.navigateTo(`/market/pages/login/login`)
 				// uni.navigateToMiniProgram({
 				// 	appId: 'wx5a5cda32926f55ac',
 				// 	path: '/pages/tabBar/home/home',

pages/user/order/order-details.vue

@@ -95,10 +95,11 @@
 			if(this.shareType ==='share'){
 				this.state = 0
 				this.isOrderShare = true
-			}else if(option.type === 'confim'){
+			}else if(option.type === 'confim' ||option.type === 'search'){
 				this.state = 0
 			}else{
 				this.state = option.state
+				
 			}
 			this.getHeaderTopHeight()
 			this.initOrderDetaileData()
@@ -174,7 +175,7 @@
 						this.$util.msg(response.msg,2000,true,'success');
 						setTimeout(() => {
 							if(this.shareType ==='share'){
-								this.$api.switchTabTo('/pages/tabBar/user/user')
+								this.$api.switchTabTo('/pages/tabBar/home/home')
 							}else{
 								this.$api.redirectTo(`/pages/user/order/order-list?type=detele&state=${this.state}`)
 							}

pages/user/order/order-logistics.vue

@@ -113,7 +113,7 @@
 								logisticsArr.push({
 									expressname: loItem['logisticsCompanyName'],
 									expressNumber: loItem['nu'],
-									expressNewtime: loItem['updateDate'],
+									expressNewtime: item.deliveryTime,
 									isOpen: false
 								})
 								if(loIndex == 0) {

pages/user/order/orderShareLogin.vue

@@ -35,7 +35,9 @@
 			console.log(e)
 			this.orderID = e.orderID
 			this.userID = e.userID
-			this.serviceProviderId = e.serviceProviderId
+			if(e.serviceProviderId){
+				this.serviceProviderId = e.serviceProviderId
+			}
 		},
 		methods:{
 			initQueryUser(){