李万涛 1 anno fa
parent
commit
4b914e7748
100 ha cambiato i file con 189 aggiunte e 269 eliminazioni
  1. 3 3
      pages/index.vue
  2. 4 4
      pages/index/customMian_step1/index.vue
  3. 3 3
      pages/mall.vue
  4. 48 96
      pages/my.vue
  5. 3 3
      pages/service.vue
  6. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  7. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/navBar/index.js.map
  8. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/popup/index.js.map
  9. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/privacyPopup/index.js.map
  10. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/wike-painter/wike-painter.js.map
  11. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index.js.map
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/addrList/index.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/aiControlSys/index.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/aiControlSys_step2/index.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/customMian/index.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/customMian_step1/index.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/customNoMain/index.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/customNoMian_step1/index.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/customNoMian_step2/index.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/fullHouseWifi/index.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/fullHouseWifi_step2/index.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/mainDetail/index.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/mainList/index.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/productLead/index.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/productLeadDetail/index.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/rule/index.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mall.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mall/detail/index.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mall/goodsList/index.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/mall/pickKeting/index.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/index.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/aboutMe/index.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/actDetail2/index.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/actGoods/index.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/actGoodsDetail/index.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/changeNewGoods/index.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/changeNewStep/index.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/collect/index.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/collectDetail/index.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/duijiang/index.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/feedBack/index.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/inviteDetail/index.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/inviteSellAfter/index.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/otherInfo/index.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/index.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/recordCydg/index.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/sellAfter/index.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/sellAfterCon/index.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/sellAfterDefer/index.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/set/index.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/test/index.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/useLead/index.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/userInfo/index.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/privicyPopup/index.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/qrPage/index.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/service.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/service/detail/index.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/test/index.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  64. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map
  65. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.js.map
  66. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js.map
  67. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map
  68. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-count-down/u-count-down.js.map
  69. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map
  70. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-empty/u-empty.js.map
  71. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-gap/u-gap.js.map
  72. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
  73. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js.map
  74. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js.map
  75. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  76. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-page/u-loading-page.js.map
  77. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loadmore/u-loadmore.js.map
  78. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.js.map
  79. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
  80. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-parse/node/node.js.map
  81. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-parse/u-parse.js.map
  82. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js.map
  83. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
  84. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
  85. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-sticky/u-sticky.js.map
  86. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  87. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swiper/u-swiper.js.map
  88. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-switch/u-switch.js.map
  89. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabs/u-tabs.js.map
  90. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-textarea/u-textarea.js.map
  91. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js.map
  92. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
  93. 3 4
      unpackage/dist/dev/mp-weixin/pages/index.js
  94. 51 16
      unpackage/dist/dev/mp-weixin/pages/index/customMian_step1/index.js
  95. 0 0
      unpackage/dist/dev/mp-weixin/pages/index/customMian_step1/index.wxml
  96. 3 3
      unpackage/dist/dev/mp-weixin/pages/mall.js
  97. 66 132
      unpackage/dist/dev/mp-weixin/pages/my.js
  98. 0 0
      unpackage/dist/dev/mp-weixin/pages/my.wxml
  99. 3 3
      unpackage/dist/dev/mp-weixin/pages/service.js
  100. 2 2
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.json

+ 3 - 3
pages/index.vue

xqd
@@ -282,9 +282,9 @@
 		onShow() {
 			this.handlePrivate()
 
-			// if (!uni.getStorageSync('switchs')) {
-			uni.setStorageSync('switchs', [1, 0, 0])
-			// }
+			if (!uni.getStorageSync('switchs')) {
+				uni.setStorageSync('switchs', [1, 0, 0])
+			}
 			// if (!uni.getStorageSync('priceConfig')) {
 			uni.request({
 				url: uploadUrl.baseUrl + '/api/common/getPriceConfig',

+ 4 - 4
pages/index/customMian_step1/index.vue

xqd xqd xqd xqd
@@ -71,7 +71,7 @@
 					:class="[selKt.includes(item)?'act3':'']" v-for="(item,index) in brandTypeList"> -->
 
 				<image @click="goDetail(item,index,'挑选客厅灯')" class="item3 " :src="picBase+item.cover"
-					:class="[selKt.includes(item)?'act3':'']" v-for="(item,index) in brandTypeList">
+					:class="[selKt.includes(item)?'act3':'']" v-for="(item,index) in brandTypeList.slice(0,4)">
 
 				</image>
 			</view>
@@ -89,7 +89,7 @@
 					:class="[selCt.includes(item)?'act3':'']" v-for="(item,index) in lockTypeList">
 				</image> -->
 				<image @click="goDetail(item,index,'挑选餐厅灯')" class="item3 " :src="picBase+item.cover"
-					:class="[selCt.includes(item)?'act3':'']" v-for="(item,index) in lockTypeList">
+					:class="[selCt.includes(item)?'act3':'']" v-for="(item,index) in lockTypeList.slice(0,4)">
 				</image>
 			</view>
 
@@ -106,7 +106,7 @@
 					:class="[selWs.includes(item)?'act3':'']" v-for="(item,index) in chuanglianTypeList">
 				</image> -->
 				<image @click="goDetail(item,index,'挑选卧室灯')" class="item3 " :src="picBase+item.cover"
-					:class="[selWs.includes(item)?'act3':'']" v-for="(item,index) in chuanglianTypeList">
+					:class="[selWs.includes(item)?'act3':'']" v-for="(item,index) in chuanglianTypeList.slice(0,4)">
 				</image>
 			</view>
 
@@ -124,7 +124,7 @@
 				</image> -->
 
 				<image @click="goDetail(item,index,'挑选阳台灯')" class="item3 " :src="picBase+item.cover"
-					:class="[selYt.includes(item)?'act3':'']" v-for="(item,index) in pannelTypeList">
+					:class="[selYt.includes(item)?'act3':'']" v-for="(item,index) in pannelTypeList.slice(0,4)">
 				</image>
 			</view>
 

+ 3 - 3
pages/mall.vue

xqd
@@ -161,9 +161,9 @@
 			}
 		},
 		async onShow() {
-			// if (!uni.getStorageSync('switchs')) {
-			uni.setStorageSync('switchs', [1, 0, 0])
-			// }
+			if (!uni.getStorageSync('switchs')) {
+				uni.setStorageSync('switchs', [1, 0, 0])
+			}
 			// if (!uni.getStorageSync('priceConfig')) {
 			uni.request({
 				url: uploadUrl.baseUrl + '/api/common/getPriceConfig',

+ 48 - 96
pages/my.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -105,7 +105,21 @@
 					</view>
 					<view class="right">
 						<text class="num" v-if="item.phone">{{item.phone}}</text>
-						<image src="/static/my/arr_r.png" mode="" style="height: 24rpx;width: 14rpx;"></image>
+						<image src="/static/my/arr_r.png" mode="" style="height: 24rpx;width: 14rpx;">
+						</image>
+					</view>
+				</view>
+				<view class="item" @click="toPage(item)" v-for="(item,index) in serList2">
+					<view class="left">
+						<!-- <image :src="item.icon" mode="heightFix" style="height: 31rpx;width: 36rpx;" ></image> -->
+						<image :src="item.icon" :mode="item.name!='关于我们'?'heightFix':'widthFix'" style="width: 36rpx;"
+							:style="{height:item.name=='关于我们'?'36rpx':'31rpx'}"></image>
+						<text>{{item.name}}</text>
+					</view>
+					<view class="right">
+						<text class="num" v-if="item.phone">{{item.phone}}</text>
+						<image src="/static/my/arr_r.png" mode="" style="height: 24rpx;width: 14rpx;">
+						</image>
 					</view>
 				</view>
 			</view>
@@ -201,13 +215,15 @@
 					seconds: 0,
 					milliseconds: 0
 				},
-				loading: true
+				loading: true,
+
+				serList2: []
 			}
 		},
 		async onShow() {
-			// if (!uni.getStorageSync('switchs')) {
-			uni.setStorageSync('switchs', [1, 0, 0])
-			// }
+			if (!uni.getStorageSync('switchs')) {
+				uni.setStorageSync('switchs', [1, 0, 0])
+			}
 			// if (!uni.getStorageSync('priceConfig')) {
 			uni.request({
 				url: uploadUrl.baseUrl + '/api/common/getPriceConfig',
@@ -225,7 +241,33 @@
 				let res = await getUserInfoReq()
 				if (res.code == 0) {
 					this.userInfo = res.data
+					// this.userInfo.role = 3
 
+					if (this.userInfo.role == 1) {
+						this.serList2 = [{
+							icon: this.$picUrl + '/static/my/tg.png',
+							name: '活动商品',
+							url: '/pages/my/actGoods/index'
+						}, ]
+					} else if (this.userInfo.role == 2) {
+						this.serList2 = [{
+							icon: this.$picUrl + '/static/my/qt.png',
+							name: '售后',
+							url: '/pages/my/sellAfter/index'
+						}, ]
+					} else if (this.userInfo.role == 3) {
+						this.serList2 = [{
+								icon: this.$picUrl + '/static/my/tg.png',
+								name: '活动商品',
+								url: '/pages/my/actGoods/index'
+							},
+							{
+								icon: this.$picUrl + '/static/my/qt.png',
+								name: '售后',
+								url: '/pages/my/sellAfter/index'
+							},
+						]
+					}
 					// this.userInfo = {
 					// 	head: null,
 					// 	name: null,
@@ -464,19 +506,6 @@
 							url: '/pages/my/otherInfo/index'
 						},
 					]
-					if (this.userInfo.role == 1) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/tg.png',
-							name: '活动商品',
-							url: '/pages/my/actGoods/index'
-						})
-					} else if (this.userInfo.role == 2) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/sh.png',
-							name: '售后',
-							url: '/pages/my/sellAfter/index'
-						})
-					}
 				} else if (this.role == 'svip') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/set.png',
@@ -507,19 +536,6 @@
 						},
 					]
 
-					if (this.userInfo.role == 1) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/tg.png',
-							name: '活动商品',
-							url: '/pages/my/actGoods/index'
-						})
-					} else if (this.userInfo.role == 2) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/sh.png',
-							name: '售后',
-							url: '/pages/my/sellAfter/index'
-						})
-					}
 				} else if (this.role == 'gvip') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/set.png',
@@ -549,19 +565,6 @@
 							url: '/pages/my/otherInfo/index'
 						},
 					]
-					if (this.userInfo.role == 1) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/tg.png',
-							name: '活动商品',
-							url: '/pages/my/actGoods/index'
-						})
-					} else if (this.userInfo.role == 2) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/sh.png',
-							name: '售后',
-							url: '/pages/my/sellAfter/index'
-						})
-					}
 				} else if (this.role == 'lhy') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/sc.png',
@@ -589,19 +592,6 @@
 							url: '/pages/my/otherInfo/index'
 						},
 					]
-					if (this.userInfo.role == 1) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/tg.png',
-							name: '活动商品',
-							url: '/pages/my/actGoods/index'
-						})
-					} else if (this.userInfo.role == 2) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/sh.png',
-							name: '售后',
-							url: '/pages/my/sellAfter/index'
-						})
-					}
 				} else if (this.role == 'hy') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/sc.png',
@@ -629,19 +619,6 @@
 							url: '/pages/my/otherInfo/index'
 						},
 					]
-					if (this.userInfo.role == 1) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/tg.png',
-							name: '活动商品',
-							url: '/pages/my/actGoods/index'
-						})
-					} else if (this.userInfo.role == 2) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/sh.png',
-							name: '售后',
-							url: '/pages/my/sellAfter/index'
-						})
-					}
 				} else if (this.role == 'cydg') {
 					this.serList = [{
 							icon: this.picUrl + '/static/my/set.png',
@@ -684,34 +661,9 @@
 							url: '/pages/my/otherInfo/index'
 						},
 					]
-					if (this.userInfo.role == 1) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/tg.png',
-							name: '活动商品',
-							url: '/pages/my/actGoods/index'
-						})
-					} else if (this.userInfo.role == 2) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/sh.png',
-							name: '售后',
-							url: '/pages/my/sellAfter/index'
-						})
-					}
 					// 活动用户附加于其他用户角色之上,不是一种角色,而是一种查看功能
 				} else if (this.role == 'hdyh') {
-					if (this.userInfo.role == 1) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/tg.png',
-							name: '活动商品',
-							url: '/pages/my/actGoods/index'
-						})
-					} else if (this.userInfo.role == 2) {
-						this.serList.push({
-							icon: this.picUrl + '/static/my/sh.png',
-							name: '售后',
-							url: '/pages/my/sellAfter/index'
-						})
-					}
+
 					return
 					this.serList = [
 						// {

+ 3 - 3
pages/service.vue

xqd
@@ -83,9 +83,9 @@
 			}
 		},
 		onShow() {
-			// if (!uni.getStorageSync('switchs')) {
-			uni.setStorageSync('switchs', [1, 0, 0])
-			// }
+			if (!uni.getStorageSync('switchs')) {
+				uni.setStorageSync('switchs', [1, 0, 0])
+			}
 			// if (!uni.getStorageSync('priceConfig')) {
 			uni.request({
 				url: uploadUrl.baseUrl + '/api/common/getPriceConfig',

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/navBar/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/popup/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/privacyPopup/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/wike-painter/wike-painter.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/addrList/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/aiControlSys/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/aiControlSys_step2/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/customMian/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/customMian_step1/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/customNoMain/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/customNoMian_step1/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/customNoMian_step2/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/fullHouseWifi/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/fullHouseWifi_step2/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/mainDetail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/mainList/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/productLead/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/productLeadDetail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/rule/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mall.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mall/detail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mall/goodsList/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/mall/pickKeting/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/map/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/aboutMe/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/actDetail2/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/actGoods/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/actGoodsDetail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/changeNewGoods/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/changeNewStep/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/collect/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/collectDetail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/duijiang/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/feedBack/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/inviteDetail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/inviteSellAfter/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/otherInfo/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/recordCydg/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/sellAfter/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/sellAfterCon/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/sellAfterDefer/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/set/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/test/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/useLead/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/userInfo/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/privicyPopup/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/qrPage/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/service.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/service/detail/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/test/index.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-search-bar/components/uni-search-bar/uni-search-bar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-count-down/u-count-down.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-datetime-picker/u-datetime-picker.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-empty/u-empty.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-gap/u-gap.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-input/u-input.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-page/u-loading-page.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loadmore/u-loadmore.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-parse/node/node.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-parse/u-parse.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-sticky/u-sticky.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swiper/u-swiper.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-switch/u-switch.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabs/u-tabs.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-textarea/u-textarea.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js.map


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map


+ 3 - 4
unpackage/dist/dev/mp-weixin/pages/index.js

xqd
@@ -323,10 +323,9 @@ var _default = {
   },
   onShow: function onShow() {
     this.handlePrivate();
-
-    // if (!uni.getStorageSync('switchs')) {
-    uni.setStorageSync('switchs', [1, 0, 0]);
-    // }
+    if (!uni.getStorageSync('switchs')) {
+      uni.setStorageSync('switchs', [1, 0, 0]);
+    }
     // if (!uni.getStorageSync('priceConfig')) {
     uni.request({
       url: _config.default.baseUrl + '/api/common/getPriceConfig',

+ 51 - 16
unpackage/dist/dev/mp-weixin/pages/index/customMian_step1/index.js

xqd xqd xqd xqd
@@ -131,7 +131,7 @@ var render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
-  var l0 = _vm.__map(_vm.brandTypeList, function (item, index) {
+  var l0 = _vm.__map(_vm.brandTypeList.slice(0, 4), function (item, index) {
     var $orig = _vm.__get_orig(item)
     var g0 = _vm.selKt.includes(item)
     return {
@@ -139,7 +139,7 @@ var render = function () {
       g0: g0,
     }
   })
-  var l1 = _vm.__map(_vm.lockTypeList, function (item, index) {
+  var l1 = _vm.__map(_vm.lockTypeList.slice(0, 4), function (item, index) {
     var $orig = _vm.__get_orig(item)
     var g1 = _vm.selCt.includes(item)
     return {
@@ -147,15 +147,18 @@ var render = function () {
       g1: g1,
     }
   })
-  var l2 = _vm.__map(_vm.chuanglianTypeList, function (item, index) {
-    var $orig = _vm.__get_orig(item)
-    var g2 = _vm.selWs.includes(item)
-    return {
-      $orig: $orig,
-      g2: g2,
+  var l2 = _vm.__map(
+    _vm.chuanglianTypeList.slice(0, 4),
+    function (item, index) {
+      var $orig = _vm.__get_orig(item)
+      var g2 = _vm.selWs.includes(item)
+      return {
+        $orig: $orig,
+        g2: g2,
+      }
     }
-  })
-  var l3 = _vm.__map(_vm.pannelTypeList, function (item, index) {
+  )
+  var l3 = _vm.__map(_vm.pannelTypeList.slice(0, 4), function (item, index) {
     var $orig = _vm.__get_orig(item)
     var g3 = _vm.selYt.includes(item)
     return {
@@ -173,22 +176,54 @@ var render = function () {
   var g11 = _vm.selYt.length
   var g12 = g11 != 0 ? _vm.selCt.length : null
   if (!_vm._isMounted) {
-    _vm.e0 = function ($event) {
+    _vm.e0 = function ($event, item, index) {
+      var _temp = arguments[arguments.length - 1].currentTarget.dataset,
+        _temp2 = _temp.eventParams || _temp["event-params"],
+        item = _temp2.item,
+        index = _temp2.index
+      var _temp, _temp2
+      return _vm.goDetail(item, index, "挑选客厅灯")
+    }
+    _vm.e1 = function ($event, item, index) {
+      var _temp3 = arguments[arguments.length - 1].currentTarget.dataset,
+        _temp4 = _temp3.eventParams || _temp3["event-params"],
+        item = _temp4.item,
+        index = _temp4.index
+      var _temp3, _temp4
+      return _vm.goDetail(item, index, "挑选餐厅灯")
+    }
+    _vm.e2 = function ($event, item, index) {
+      var _temp5 = arguments[arguments.length - 1].currentTarget.dataset,
+        _temp6 = _temp5.eventParams || _temp5["event-params"],
+        item = _temp6.item,
+        index = _temp6.index
+      var _temp5, _temp6
+      return _vm.goDetail(item, index, "挑选卧室灯")
+    }
+    _vm.e3 = function ($event, item, index) {
+      var _temp7 = arguments[arguments.length - 1].currentTarget.dataset,
+        _temp8 = _temp7.eventParams || _temp7["event-params"],
+        item = _temp8.item,
+        index = _temp8.index
+      var _temp7, _temp8
+      return _vm.goDetail(item, index, "挑选阳台灯")
+    }
+    _vm.e4 = function ($event) {
       _vm.showConfig = true
     }
-    _vm.e1 = function ($event) {
+    _vm.e5 = function ($event) {
       _vm.showConfig = true
     }
-    _vm.e2 = function ($event) {
+    _vm.e6 = function ($event) {
       _vm.showConfig = false
     }
-    _vm.e3 = function ($event) {
+    _vm.e7 = function ($event) {
       _vm.showConfig = false
     }
-    _vm.e4 = function ($event) {
+    _vm.e8 = function ($event) {
       _vm.showHuxing = false
     }
-    _vm.e5 = function ($event) {
+    _vm.e9 = function ($event) {
       _vm.showMissItem = false
     }
   }

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/index/customMian_step1/index.wxml


+ 3 - 3
unpackage/dist/dev/mp-weixin/pages/mall.js

xqd
@@ -376,9 +376,9 @@ var _default = {
         while (1) {
           switch (_context2.prev = _context2.next) {
             case 0:
-              // if (!uni.getStorageSync('switchs')) {
-              uni.setStorageSync('switchs', [1, 0, 0]);
-              // }
+              if (!uni.getStorageSync('switchs')) {
+                uni.setStorageSync('switchs', [1, 0, 0]);
+              }
               // if (!uni.getStorageSync('priceConfig')) {
               uni.request({
                 url: _config.default.baseUrl + '/api/common/getPriceConfig',

+ 66 - 132
unpackage/dist/dev/mp-weixin/pages/my.js

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -247,7 +247,8 @@ var _default = {
         seconds: 0,
         milliseconds: 0
       },
-      loading: true
+      loading: true,
+      serList2: []
     };
   },
   onShow: function onShow() {
@@ -258,9 +259,9 @@ var _default = {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              // if (!uni.getStorageSync('switchs')) {
-              uni.setStorageSync('switchs', [1, 0, 0]);
-              // }
+              if (!uni.getStorageSync('switchs')) {
+                uni.setStorageSync('switchs', [1, 0, 0]);
+              }
               // if (!uni.getStorageSync('priceConfig')) {
               uni.request({
                 url: _config.default.baseUrl + '/api/common/getPriceConfig',
@@ -274,7 +275,7 @@ var _default = {
               });
               // }
               if (!uni.getStorageSync('token')) {
-                _context.next = 53;
+                _context.next = 54;
                 break;
               }
               _context.next = 5;
@@ -282,11 +283,35 @@ var _default = {
             case 5:
               res = _context.sent;
               if (!(res.code == 0)) {
-                _context.next = 52;
+                _context.next = 53;
                 break;
               }
               _this2.userInfo = res.data;
-
+              // this.userInfo.role = 3
+
+              if (_this2.userInfo.role == 1) {
+                _this2.serList2 = [{
+                  icon: _this2.$picUrl + '/static/my/tg.png',
+                  name: '活动商品',
+                  url: '/pages/my/actGoods/index'
+                }];
+              } else if (_this2.userInfo.role == 2) {
+                _this2.serList2 = [{
+                  icon: _this2.$picUrl + '/static/my/qt.png',
+                  name: '售后',
+                  url: '/pages/my/sellAfter/index'
+                }];
+              } else if (_this2.userInfo.role == 3) {
+                _this2.serList2 = [{
+                  icon: _this2.$picUrl + '/static/my/tg.png',
+                  name: '活动商品',
+                  url: '/pages/my/actGoods/index'
+                }, {
+                  icon: _this2.$picUrl + '/static/my/qt.png',
+                  name: '售后',
+                  url: '/pages/my/sellAfter/index'
+                }];
+              }
               // this.userInfo = {
               // 	head: null,
               // 	name: null,
@@ -306,70 +331,70 @@ var _default = {
               // this.checkRole()
               // return
               if (!res.data.status) {
-                _context.next = 34;
+                _context.next = 35;
                 break;
               }
               _context.t0 = res.data.type;
-              _context.next = _context.t0 === 0 ? 15 : _context.t0 === 1 ? 17 : _context.t0 === 2 ? 19 : _context.t0 === 3 ? 22 : _context.t0 === 4 ? 24 : _context.t0 === 5 ? 26 : _context.t0 === 6 ? 29 : 31;
+              _context.next = _context.t0 === 0 ? 16 : _context.t0 === 1 ? 18 : _context.t0 === 2 ? 20 : _context.t0 === 3 ? 23 : _context.t0 === 4 ? 25 : _context.t0 === 5 ? 27 : _context.t0 === 6 ? 30 : 32;
               break;
-            case 15:
+            case 16:
               _this2.role = 'yk';
-              return _context.abrupt("break", 31);
-            case 17:
+              return _context.abrupt("break", 32);
+            case 18:
               _this2.role = 'svip';
-              return _context.abrupt("break", 31);
-            case 19:
+              return _context.abrupt("break", 32);
+            case 20:
               _this2.role = 'lhy';
               uni.setStorageSync('switchs', [0, 1, 0]);
-              return _context.abrupt("break", 31);
-            case 22:
+              return _context.abrupt("break", 32);
+            case 23:
               _this2.role = 'cydg';
-              return _context.abrupt("break", 31);
-            case 24:
+              return _context.abrupt("break", 32);
+            case 25:
               _this2.role = 'hdyh';
-              return _context.abrupt("break", 31);
-            case 26:
+              return _context.abrupt("break", 32);
+            case 27:
               _this2.role = 'hy';
               uni.setStorageSync('switchs', [0, 1, 0]);
-              return _context.abrupt("break", 31);
-            case 29:
+              return _context.abrupt("break", 32);
+            case 30:
               _this2.role = 'gvip';
-              return _context.abrupt("break", 31);
-            case 31:
+              return _context.abrupt("break", 32);
+            case 32:
               console.log('当前用户角色', _this2.role);
-              _context.next = 47;
+              _context.next = 48;
               break;
-            case 34:
+            case 35:
               _context.t1 = res.data.type;
-              _context.next = _context.t1 === 0 ? 37 : _context.t1 === 1 ? 39 : _context.t1 === 2 ? 41 : _context.t1 === 3 ? 43 : _context.t1 === 4 ? 45 : 47;
+              _context.next = _context.t1 === 0 ? 38 : _context.t1 === 1 ? 40 : _context.t1 === 2 ? 42 : _context.t1 === 3 ? 44 : _context.t1 === 4 ? 46 : 48;
               break;
-            case 37:
+            case 38:
               _this2.role = 'nomal';
-              return _context.abrupt("break", 47);
-            case 39:
+              return _context.abrupt("break", 48);
+            case 40:
               _this2.role = 'superAdmin';
-              return _context.abrupt("break", 47);
-            case 41:
+              return _context.abrupt("break", 48);
+            case 42:
               _this2.role = 'sjkf';
-              return _context.abrupt("break", 47);
-            case 43:
+              return _context.abrupt("break", 48);
+            case 44:
               _this2.role = 'shkf';
-              return _context.abrupt("break", 47);
-            case 45:
+              return _context.abrupt("break", 48);
+            case 46:
               _this2.role = 'yw';
-              return _context.abrupt("break", 47);
-            case 47:
+              return _context.abrupt("break", 48);
+            case 48:
               console.log('当前员工角色', _this2.role);
               _this2.checkRole();
               _this2.loading = false;
-              _context.next = 53;
+              _context.next = 54;
               break;
-            case 52:
+            case 53:
               uni.showToast({
                 title: res.message,
                 icon: 'none'
               });
-            case 53:
+            case 54:
             case "end":
               return _context.stop();
           }
@@ -560,19 +585,6 @@ var _default = {
           name: '其他信息',
           url: '/pages/my/otherInfo/index'
         }];
-        if (this.userInfo.role == 1) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/tg.png',
-            name: '活动商品',
-            url: '/pages/my/actGoods/index'
-          });
-        } else if (this.userInfo.role == 2) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/sh.png',
-            name: '售后',
-            url: '/pages/my/sellAfter/index'
-          });
-        }
       } else if (this.role == 'svip') {
         this.serList = [{
           icon: this.picUrl + '/static/my/set.png',
@@ -601,19 +613,6 @@ var _default = {
           name: '其他信息',
           url: '/pages/my/otherInfo/index'
         }];
-        if (this.userInfo.role == 1) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/tg.png',
-            name: '活动商品',
-            url: '/pages/my/actGoods/index'
-          });
-        } else if (this.userInfo.role == 2) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/sh.png',
-            name: '售后',
-            url: '/pages/my/sellAfter/index'
-          });
-        }
       } else if (this.role == 'gvip') {
         this.serList = [{
           icon: this.picUrl + '/static/my/set.png',
@@ -642,19 +641,6 @@ var _default = {
           name: '其他信息',
           url: '/pages/my/otherInfo/index'
         }];
-        if (this.userInfo.role == 1) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/tg.png',
-            name: '活动商品',
-            url: '/pages/my/actGoods/index'
-          });
-        } else if (this.userInfo.role == 2) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/sh.png',
-            name: '售后',
-            url: '/pages/my/sellAfter/index'
-          });
-        }
       } else if (this.role == 'lhy') {
         this.serList = [{
           icon: this.picUrl + '/static/my/sc.png',
@@ -679,19 +665,6 @@ var _default = {
           name: '其他信息',
           url: '/pages/my/otherInfo/index'
         }];
-        if (this.userInfo.role == 1) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/tg.png',
-            name: '活动商品',
-            url: '/pages/my/actGoods/index'
-          });
-        } else if (this.userInfo.role == 2) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/sh.png',
-            name: '售后',
-            url: '/pages/my/sellAfter/index'
-          });
-        }
       } else if (this.role == 'hy') {
         this.serList = [{
           icon: this.picUrl + '/static/my/sc.png',
@@ -716,19 +689,6 @@ var _default = {
           name: '其他信息',
           url: '/pages/my/otherInfo/index'
         }];
-        if (this.userInfo.role == 1) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/tg.png',
-            name: '活动商品',
-            url: '/pages/my/actGoods/index'
-          });
-        } else if (this.userInfo.role == 2) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/sh.png',
-            name: '售后',
-            url: '/pages/my/sellAfter/index'
-          });
-        }
       } else if (this.role == 'cydg') {
         this.serList = [{
           icon: this.picUrl + '/static/my/set.png',
@@ -766,34 +726,8 @@ var _default = {
           name: '其他信息',
           url: '/pages/my/otherInfo/index'
         }];
-        if (this.userInfo.role == 1) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/tg.png',
-            name: '活动商品',
-            url: '/pages/my/actGoods/index'
-          });
-        } else if (this.userInfo.role == 2) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/sh.png',
-            name: '售后',
-            url: '/pages/my/sellAfter/index'
-          });
-        }
         // 活动用户附加于其他用户角色之上,不是一种角色,而是一种查看功能
       } else if (this.role == 'hdyh') {
-        if (this.userInfo.role == 1) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/tg.png',
-            name: '活动商品',
-            url: '/pages/my/actGoods/index'
-          });
-        } else if (this.userInfo.role == 2) {
-          this.serList.push({
-            icon: this.picUrl + '/static/my/sh.png',
-            name: '售后',
-            url: '/pages/my/sellAfter/index'
-          });
-        }
         return;
         this.serList = [
           // {

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/my.wxml


+ 3 - 3
unpackage/dist/dev/mp-weixin/pages/service.js

xqd
@@ -276,9 +276,9 @@ var _default = {
     }))();
   },
   onShow: function onShow() {
-    // if (!uni.getStorageSync('switchs')) {
-    uni.setStorageSync('switchs', [1, 0, 0]);
-    // }
+    if (!uni.getStorageSync('switchs')) {
+      uni.setStorageSync('switchs', [1, 0, 0]);
+    }
     // if (!uni.getStorageSync('priceConfig')) {
     uni.request({
       url: _config.default.baseUrl + '/api/common/getPriceConfig',

+ 2 - 2
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.json

xqd
@@ -1,4 +1,4 @@
 {
-  "usingComponents": {},
-  "component": true
+  "component": true,
+  "usingComponents": {}
 }

Some files were not shown because too many files changed in this diff