我的-关于我们调整

pages/mall/detail/index.vue

@@ -187,14 +187,46 @@
 			} else {
 				let res = await getMyGoodsDetailReq({
 					id: getApp().mallItem.id
+					// id: 70
 				})
 				if (res.code == 0) {
-					console.log('进入详情返回值', res);
+					console.log('进入详情返回值666', res);
 					// this.skuParams = res.data.sku_params
+
+
 					this.skuParams = res.data.sku_params || {
 						"attrs": {},
 						"sku": []
 					}
+					// this.skuParams = {
+					// 	"attrs": {
+					// 		"颜色": ['红色', '绿色'],
+					// 		"尺寸": ['1cm', '2cm'],
+					// 	},
+					// 	"sku": [{
+					// 			'颜色': '红色',
+					// 			'尺寸': '1cm',
+					// 			"price": 1
+					// 		},
+					// 		{
+					// 			'颜色': '红色',
+					// 			'尺寸': '2cm',
+					// 			"price": 2
+					// 		},
+					// 		{
+					// 			'颜色': '绿色',
+					// 			'尺寸': '1cm',
+					// 			"price": 3
+					// 		},
+					// 		{
+					// 			'颜色': '绿色',
+					// 			'尺寸': '2cm',
+					// 			"price": 4
+					// 		},
+
+					// 	]
+					// }
+
 					// 动态生成判断条件对象数组
 					let c = []
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {

pages/my.vue

@@ -29,7 +29,7 @@
 								</view>
 							</view>
 						</view>
-						<view class="lMember" v-if="token&&role=='hdhy'" @click="toPage('info')">
+						<view class="lMember" v-if="token&&role=='hdyh'" @click="toPage('info')">
 							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(活动会员)'}}</text>
 							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
@@ -159,11 +159,11 @@
 						name: '小程序使用指南',
 						url: '/pages/my/useLead/index'
 					},
-					{
-						icon: this.$picUrl + '/static/other/aboutMe.png',
-						name: '关于我们',
-						url: '/pages/my/aboutMe/index',
-					},
+					// {
+					// 	icon: this.$picUrl + '/static/other/aboutMe.png',
+					// 	name: '关于我们',
+					// 	url: '/pages/my/aboutMe/index',
+					// },
 					{
 						icon: this.$picUrl + '/static/my/qt.png',
 						name: '其他信息',
@@ -222,7 +222,7 @@
 					}
 
 
-					// this.role = 'lhy'
+					// this.role = 'hdyh'
 					// this.checkRole()
 					// return
 					if (res.data.status) {
@@ -423,11 +423,11 @@
 							name: '小程序使用指南',
 							url: '/pages/my/useLead/index'
 						},
-						{
-							icon: this.picUrl + '/static/other/aboutMe.png',
-							name: '关于我们',
-							url: '/pages/my/aboutMe/index'
-						},
+						// {
+						// 	icon: this.picUrl + '/static/other/aboutMe.png',
+						// 	name: '关于我们',
+						// 	url: '/pages/my/aboutMe/index'
+						// },
 						{
 							icon: this.$picUrl + '/static/my/qt.png',
 							name: '其他信息',
@@ -465,11 +465,11 @@
 							name: '小程序使用指南',
 							url: '/pages/my/useLead/index'
 						},
-						{
-							icon: this.picUrl + '/static/other/aboutMe.png',
-							name: '关于我们',
-							url: '/pages/my/aboutMe/index'
-						},
+						// {
+						// 	icon: this.picUrl + '/static/other/aboutMe.png',
+						// 	name: '关于我们',
+						// 	url: '/pages/my/aboutMe/index'
+						// },
 						{
 							icon: this.$picUrl + '/static/my/qt.png',
 							name: '其他信息',
@@ -508,11 +508,11 @@
 							name: '小程序使用指南',
 							url: '/pages/my/useLead/index'
 						},
-						{
-							icon: this.picUrl + '/static/other/aboutMe.png',
-							name: '关于我们',
-							url: '/pages/my/aboutMe/index'
-						},
+						// {
+						// 	icon: this.picUrl + '/static/other/aboutMe.png',
+						// 	name: '关于我们',
+						// 	url: '/pages/my/aboutMe/index'
+						// },
 						{
 							icon: this.$picUrl + '/static/my/qt.png',
 							name: '其他信息',
@@ -548,11 +548,11 @@
 							name: '小程序使用指南',
 							url: '/pages/my/useLead/index'
 						},
-						{
-							icon: this.picUrl + '/static/other/aboutMe.png',
-							name: '关于我们',
-							url: '/pages/my/aboutMe/index'
-						},
+						// {
+						// 	icon: this.picUrl + '/static/other/aboutMe.png',
+						// 	name: '关于我们',
+						// 	url: '/pages/my/aboutMe/index'
+						// },
 						{
 							icon: this.$picUrl + '/static/my/qt.png',
 							name: '其他信息',
@@ -588,11 +588,11 @@
 							name: '小程序使用指南',
 							url: '/pages/my/useLead/index'
 						},
-						{
-							icon: this.picUrl + '/static/other/aboutMe.png',
-							name: '关于我们',
-							url: '/pages/my/aboutMe/index'
-						},
+						// {
+						// 	icon: this.picUrl + '/static/other/aboutMe.png',
+						// 	name: '关于我们',
+						// 	url: '/pages/my/aboutMe/index'
+						// },
 						{
 							icon: this.$picUrl + '/static/my/qt.png',
 							name: '其他信息',
@@ -633,11 +633,11 @@
 							name: '小程序使用指南',
 							url: '/pages/my/useLead/index'
 						},
-						{
-							icon: this.picUrl + '/static/other/aboutMe.png',
-							name: '关于我们',
-							url: '/pages/my/aboutMe/index'
-						},
+						// {
+						// 	icon: this.picUrl + '/static/other/aboutMe.png',
+						// 	name: '关于我们',
+						// 	url: '/pages/my/aboutMe/index'
+						// },
 						{
 							icon: this.$picUrl + '/static/my/qt.png',
 							name: '其他信息',
@@ -657,7 +657,22 @@
 							url: '/pages/my/sellAfter/index'
 						})
 					}
-				} else if (this.role == 'hdhy') {
+					// 活动用户附加于其他用户角色之上，不是一种角色，而是一种查看功能
+				} 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 = [
 						// {
 						// 	icon: this.picUrl + '/static/my/set.png',

unpackage/dist/build/mp-weixin/uni_modules/uview-ui/components/u-count-down/u-count-down.json

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

unpackage/dist/build/mp-weixin/uni_modules/uview-ui/components/u-sticky/u-sticky.json

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

unpackage/dist/build/mp-weixin/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.json

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

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"jiancaiPro","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"jiancaiPro","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败，请尽量确保 data 函数中不访问 vm 对象，否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8934,7 +8934,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"jiancaiPro","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"jiancaiPro","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8955,14 +8955,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"jiancaiPro","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"jiancaiPro","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"jiancaiPro","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"jiancaiPro","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9058,7 +9058,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"jiancaiPro","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"jiancaiPro","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));