Bladeren bron

隐私协议完成

李万涛 1 jaar geleden
bovenliggende
commit
5cc31bd1d1
100 gewijzigde bestanden met toevoegingen van 445 en 117 verwijderingen
  1. 10 0
      App.vue
  2. 14 10
      common/config.js
  3. 5 0
      components/navBar/index.vue
  4. 9 5
      components/privacyPopup/index.scss
  5. 8 5
      components/privacyPopup/index.vue
  6. 7 1
      manifest.json
  7. 8 1
      pages.json
  8. 59 2
      pages/index.vue
  9. 44 10
      pages/mall/detail/index.vue
  10. 49 30
      pages/my.vue
  11. 9 3
      pages/my/duijiang/index.vue
  12. 45 3
      pages/my/feedBack/index.vue
  13. 20 0
      pages/my/inviteSellAfter/index.scss
  14. 51 0
      pages/my/inviteSellAfter/index.vue
  15. 2 1
      pages/my/recordCydg/index.scss
  16. 9 9
      pages/my/recordCydg/index.vue
  17. 51 9
      pages/my/userInfo/index.vue
  18. 1 0
      unpackage/dist/build/mp-weixin/App.wxml
  19. 8 1
      unpackage/dist/build/mp-weixin/app.json
  20. 0 0
      unpackage/dist/build/mp-weixin/common/main.js
  21. 0 0
      unpackage/dist/build/mp-weixin/common/vendor.js
  22. 0 1
      unpackage/dist/build/mp-weixin/components/navBar/index.js
  23. 1 1
      unpackage/dist/build/mp-weixin/components/navBar/index.wxml
  24. 1 1
      unpackage/dist/build/mp-weixin/components/navBar/index.wxss
  25. 2 2
      unpackage/dist/build/mp-weixin/components/popup/index.js
  26. 2 2
      unpackage/dist/build/mp-weixin/components/privacyPopup/index.js
  27. 0 0
      unpackage/dist/build/mp-weixin/components/wike-painter/wike-painter.js
  28. 0 0
      unpackage/dist/build/mp-weixin/pages/index.js
  29. 0 0
      unpackage/dist/build/mp-weixin/pages/index/addrList/index.js
  30. 0 0
      unpackage/dist/build/mp-weixin/pages/index/aiControlSys/index.js
  31. 0 0
      unpackage/dist/build/mp-weixin/pages/index/aiControlSys_step2/index.js
  32. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customMian/index.js
  33. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customMian_step1/index.js
  34. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customNoMain/index.js
  35. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customNoMian_step1/index.js
  36. 0 0
      unpackage/dist/build/mp-weixin/pages/index/customNoMian_step2/index.js
  37. 0 0
      unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi/index.js
  38. 0 0
      unpackage/dist/build/mp-weixin/pages/index/fullHouseWifi_step2/index.js
  39. 0 0
      unpackage/dist/build/mp-weixin/pages/index/mainDetail/index.js
  40. 0 0
      unpackage/dist/build/mp-weixin/pages/index/mainList/index.js
  41. 0 0
      unpackage/dist/build/mp-weixin/pages/index/productLead/index.js
  42. 0 0
      unpackage/dist/build/mp-weixin/pages/index/productLeadDetail/index.js
  43. 1 1
      unpackage/dist/build/mp-weixin/pages/index/rule/index.js
  44. 0 0
      unpackage/dist/build/mp-weixin/pages/mall.js
  45. 0 0
      unpackage/dist/build/mp-weixin/pages/mall/detail/index.js
  46. 0 0
      unpackage/dist/build/mp-weixin/pages/mall/detail/index.wxml
  47. 0 0
      unpackage/dist/build/mp-weixin/pages/mall/detail/index.wxss
  48. 0 0
      unpackage/dist/build/mp-weixin/pages/mall/goodsList/index.js
  49. 1 1
      unpackage/dist/build/mp-weixin/pages/mall/pickKeting/index.js
  50. 1 1
      unpackage/dist/build/mp-weixin/pages/map/index.js
  51. 0 0
      unpackage/dist/build/mp-weixin/pages/my.js
  52. 1 2
      unpackage/dist/build/mp-weixin/pages/my.json
  53. 0 0
      unpackage/dist/build/mp-weixin/pages/my.wxml
  54. 0 0
      unpackage/dist/build/mp-weixin/pages/my.wxss
  55. 1 1
      unpackage/dist/build/mp-weixin/pages/my/aboutMe/index.js
  56. 0 0
      unpackage/dist/build/mp-weixin/pages/my/actDetail2/index.js
  57. 0 0
      unpackage/dist/build/mp-weixin/pages/my/actGoods/index.js
  58. 0 0
      unpackage/dist/build/mp-weixin/pages/my/actGoodsDetail/index.js
  59. 0 0
      unpackage/dist/build/mp-weixin/pages/my/changeNewGoods/index.js
  60. 0 0
      unpackage/dist/build/mp-weixin/pages/my/changeNewStep/index.js
  61. 0 1
      unpackage/dist/build/mp-weixin/pages/my/chapinShip/index.js
  62. 0 1
      unpackage/dist/build/mp-weixin/pages/my/chapinShip/index.wxml
  63. 0 1
      unpackage/dist/build/mp-weixin/pages/my/chapinShip/index.wxss
  64. 0 0
      unpackage/dist/build/mp-weixin/pages/my/collect/index.js
  65. 0 0
      unpackage/dist/build/mp-weixin/pages/my/collectDetail/index.js
  66. 0 0
      unpackage/dist/build/mp-weixin/pages/my/duijiang/index.js
  67. 0 0
      unpackage/dist/build/mp-weixin/pages/my/duijiang/index.wxml
  68. 1 1
      unpackage/dist/build/mp-weixin/pages/my/duijiang/index.wxss
  69. 0 0
      unpackage/dist/build/mp-weixin/pages/my/feedBack/index.js
  70. 0 0
      unpackage/dist/build/mp-weixin/pages/my/inviteDetail/index.js
  71. 1 0
      unpackage/dist/build/mp-weixin/pages/my/inviteSellAfter/index.js
  72. 7 0
      unpackage/dist/build/mp-weixin/pages/my/inviteSellAfter/index.json
  73. 1 0
      unpackage/dist/build/mp-weixin/pages/my/inviteSellAfter/index.wxml
  74. 1 0
      unpackage/dist/build/mp-weixin/pages/my/inviteSellAfter/index.wxss
  75. 1 1
      unpackage/dist/build/mp-weixin/pages/my/otherInfo/index.js
  76. 0 0
      unpackage/dist/build/mp-weixin/pages/my/protocol/index.js
  77. 1 0
      unpackage/dist/build/mp-weixin/pages/my/recordCydg/index.js
  78. 0 0
      unpackage/dist/build/mp-weixin/pages/my/recordCydg/index.json
  79. 1 0
      unpackage/dist/build/mp-weixin/pages/my/recordCydg/index.wxml
  80. 1 0
      unpackage/dist/build/mp-weixin/pages/my/recordCydg/index.wxss
  81. 1 1
      unpackage/dist/build/mp-weixin/pages/my/sellAfter/index.js
  82. 0 0
      unpackage/dist/build/mp-weixin/pages/my/sellAfterCon/index.js
  83. 0 0
      unpackage/dist/build/mp-weixin/pages/my/sellAfterDefer/index.js
  84. 0 0
      unpackage/dist/build/mp-weixin/pages/my/set/index.js
  85. 1 1
      unpackage/dist/build/mp-weixin/pages/my/test/index.js
  86. 0 0
      unpackage/dist/build/mp-weixin/pages/my/useLead/index.js
  87. 0 0
      unpackage/dist/build/mp-weixin/pages/my/userInfo/index.js
  88. 2 1
      unpackage/dist/build/mp-weixin/pages/my/userInfo/index.json
  89. 0 0
      unpackage/dist/build/mp-weixin/pages/my/userInfo/index.wxml
  90. 1 1
      unpackage/dist/build/mp-weixin/pages/my/userInfo/index.wxss
  91. 1 1
      unpackage/dist/build/mp-weixin/pages/privicyPopup/index.js
  92. 0 0
      unpackage/dist/build/mp-weixin/pages/qrPage/index.js
  93. 0 0
      unpackage/dist/build/mp-weixin/pages/service.js
  94. 0 0
      unpackage/dist/build/mp-weixin/pages/service/detail/index.js
  95. 0 0
      unpackage/dist/build/mp-weixin/pages/test/index.js
  96. 2 2
      unpackage/dist/build/mp-weixin/project.config.json
  97. 0 0
      unpackage/dist/build/mp-weixin/uni_modules/uni-collapse/components/uni-collapse-item/uni-collapse-item.js
  98. 0 0
      unpackage/dist/build/mp-weixin/uni_modules/uni-collapse/components/uni-collapse/uni-collapse.js
  99. 0 0
      unpackage/dist/build/mp-weixin/uni_modules/uni-data-select/components/uni-data-select/uni-data-select.js
  100. 2 2
      unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js

+ 10 - 0
App.vue

xqd xqd xqd xqd
@@ -1,3 +1,6 @@
+<template>
+
+</template>
 <script>
 	// import {
 	// 	getPricePercentReq,
@@ -6,6 +9,8 @@
 	// 	getUserInfoReq,
 	// } from '@/api/test/index.js'
 	import uploadUrl from '@/common/config.js'
+
+	// import PrivacyPopup from "@/components/privacyPopup/index.vue";
 	export default {
 		globalData: {
 			showPrivacy: false,
@@ -15,6 +20,7 @@
 			userInfo: {}
 		},
 		async onLaunch(options) {
+			let _this = this
 			if (uni.getPrivacySetting) {
 				uni.getPrivacySetting({
 					success: res => {
@@ -64,6 +70,10 @@
 		async onShow() {},
 		onHide: function() {
 			// console.log('App Hide')
+		},
+
+		methods: {
+
 		}
 	}
 </script>

+ 14 - 10
common/config.js

xqd
@@ -1,21 +1,25 @@
 let configUrl = {}
 if (process.env.NODE_ENV === 'development') {
 	configUrl = {
-		baseUrl: 'https://t23.9026.com',
-		picUrl: 'https://t23.9026.com',
-		picBase: 'https://t23.9026.com/uploads/',
+		// baseUrl: 'https://t23.9026.com',
+		// picUrl: 'https://t23.9026.com',
+		// picBase: 'https://t23.9026.com/uploads/',
 
-		appId: 'wx98ab2939999e13de',
-		shareModel: 2
+		baseUrl: 'https://jgs.9026.com',
+		picUrl: 'https://jgs.9026.com',
+		picBase: 'https://jgs.9026.com/uploads/',
+
+		appId: 'wx03acaa2776bdaceb',
+		shareModel: 0
 	}
 } else {
 	configUrl = {
-		baseUrl: 'https://t23.9026.com',
-		picUrl: 'https://t23.9026.com',
-		picBase: 'https://t23.9026.com/uploads/',
+		baseUrl: 'https://jgs.9026.com',
+		picUrl: 'https://jgs.9026.com',
+		picBase: 'https://jgs.9026.com/uploads/',
 
-		appId: 'wx98ab2939999e13de',
-		shareModel: 2
+		appId: 'wx03acaa2776bdaceb',
+		shareModel: 0
 	}
 }
 

+ 5 - 0
components/navBar/index.vue

xqd
@@ -61,6 +61,11 @@
 				type: Boolean,
 				default: false
 			},
+			backHome: { // 是否显示返回按钮(不传值默认不显示)
+				type: Boolean,
+				default: false
+			},
+
 		},
 
 		created() {

+ 9 - 5
components/privacyPopup/index.scss

xqd xqd
@@ -1,13 +1,17 @@
+// ::v-deep .u-popup__content{
+// }
+
 .popup-box {
-		width: 80vw;
+		width: 90vw;
 		// height: 40vh;
 		overflow: hidden;
 		background: #ffffff;
 		padding: 30rpx;
 		border-radius: 24rpx;
+		z-index: 99999999999999999999999999999!important;
 
 		.weui-half-screen-dialog__hd {
-			font-size: 48rpx;
+			font-size: 34rpx;
 			font-family: Source Han Sans CN-Bold, Source Han Sans CN;
 			font-weight: bold;
 			color: #000000;
@@ -38,18 +42,18 @@
 				font-size: 32rpx;
 				font-family: Source Han Sans CN-Normal, Source Han Sans CN;
 				font-weight: 400;
-				color: #000000;
+				color: orangered;
 				line-height: 80rpx;
 				// border: 2rpx solid #8BC21F;
 			}
 
 			.agree {
 				color: #ffffff;
-				background: linear-gradient(90deg, #8BC21F 0%, #7AB30A 100%);
+				background: linear-gradient(90deg, orange 0%, orangered 100%);
 			}
 		}
 
 		.color-8BC21F {
-			color: #8BC21F !important;
+			color: orange !important;
 		}
 	}

+ 8 - 5
components/privacyPopup/index.vue

xqd xqd xqd xqd
@@ -1,5 +1,5 @@
 <template>
-	<uni-popup ref="popup" type="center" :is-mask-click="false">
+	<u-popup :show="showPrivateBox" @close="" @open="" :round="10">
 		<view class="popup-box">
 			<view class="weui-half-screen-dialog__hd">
 				{{title}}
@@ -17,7 +17,7 @@
 					@agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
 			</view>
 		</view>
-	</uni-popup>
+	</u-popup>
 </template>
 
 <script>
@@ -30,6 +30,8 @@
 				desc2: "当您点击同意并开始使用产品服务时,即表示你已理解并同意该条款内容,该条款将对您产生法律约束力。如您拒绝,将无法更好的体验产品。",
 			};
 		},
+
+		props: ['showPrivateBox'],
 		methods: {
 			openPrivacyContract() {
 				wx.openPrivacyContract({
@@ -40,11 +42,12 @@
 			},
 			handleAgreePrivacyAuthorization() {
 				getApp().globalData.showPrivacy = false;
-				this.$emit('confirm');
-				this.$refs.popup.close();
+				this.$emit('confirmP');
 			},
 			handleDisagree() {
-				this.$refs.popup.close();
+
+				console.log('handleDisagree()');
+				this.$emit('cancleP');
 			}
 		}
 	}

+ 7 - 1
manifest.json

xqd xqd
@@ -49,7 +49,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx98ab2939999e13de",
+        "appid" : "wx03acaa2776bdaceb",
         "setting" : {
             "urlCheck" : false
         },
@@ -57,6 +57,12 @@
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "用于小程序使用中为您提供位置信息"
+            },
+            "scope.writePhotosAlbum" : {
+                "desc" : "你的相册将用于选择上传你的个人头像"
+            },
+            "scope.camera" : {
+                "desc" : "你的摄像头将用于选择上传你的个人头像"
             }
         },
         "requiredPrivateInfos" : [ "getLocation", "choosePoi", "chooseAddress", "chooseLocation" ]

+ 8 - 1
pages.json

xqd xqd
@@ -218,7 +218,7 @@
 					}
 				},
 				{
-					"path": "chapinShip/index",
+					"path": "recordCydg/index",
 					"style": {
 						"navigationBarTitleText": "",
 						"enablePullDownRefresh": false
@@ -344,6 +344,13 @@
 						"enablePullDownRefresh": false
 					}
 				},
+				{
+					"path": "inviteSellAfter/index",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "test/index",
 					"style": {

+ 59 - 2
pages/index.vue

xqd xqd xqd xqd xqd
@@ -140,10 +140,14 @@
 			<u-loadmore style="" loadmoreText="已经到底啦" color="#CCCCCC" lineColor="#CCCCCC" line />
 		</view>
 		<u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
+
+		<!-- 隐私弹框 -->
+		<privacy-popup @confirmP="confirmP" @cancleP="cancleP" :showPrivateBox="showPop"></privacy-popup>
 	</view>
 </template>
 
 <script>
+	import PrivacyPopup from "@/components/privacyPopup/index.vue";
 	import {
 		getBannerDataReq,
 		getAddressDataReq,
@@ -156,8 +160,13 @@
 		addInviteReq
 	} from '@/api/test/index.js'
 	export default {
+		components: {
+			PrivacyPopup
+		},
 		data() {
 			return {
+				showPop: false,
+
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 				leadList: [],
@@ -184,6 +193,7 @@
 			}
 		},
 		async onLoad(o) {
+
 			// o.inviteId = ''
 			let res55 = await getBannerDataReq()
 			if (res55.code == 0) {
@@ -266,8 +276,56 @@
 					icon: 'none'
 				})
 			}
+
+		},
+		onShow() {
+			this.handlePrivate()
 		},
 		methods: {
+			confirmP() {
+				this.showPop = false
+				uni.showTabBar({
+					animation: true, // 是否需要滚动动画,默认false
+					success: function(res) {
+
+					}
+				})
+			},
+			cancleP() {
+
+				console.log('cancelP()------');
+				this.showPop = false
+				uni.showTabBar({
+					animation: true, // 是否需要滚动动画,默认false
+					success: function(res) {
+
+					}
+				})
+			},
+			handlePrivate() {
+				uni.hideTabBar()
+				let _this = this
+				if (uni.getPrivacySetting) {
+					uni.getPrivacySetting({
+						success: res => {
+							console.log("是否需要授权--首页:", res.needAuthorization, "隐私协议的名称为:", res
+								.privacyContractName)
+							if (res.needAuthorization) {
+								getApp().globalData.showPrivacy = true;
+								_this.showPop = true
+							} else {
+								getApp().globalData.showPrivacy = false;
+								uni.showTabBar({
+									animation: true, // 是否需要滚动动画,默认false
+									success: function(res) {}
+								})
+							}
+						},
+						fail: () => {},
+						complete: () => {},
+					})
+				}
+			},
 			bindChange(e) {
 				this.currTabIndex = e.detail.current
 				console.log('e-----------', e.detail.current);
@@ -328,8 +386,7 @@
 				let res = await getBannerDataReq()
 				this.$toast(res.msg)
 				console.log('返回值', res);
-			},
-
+			}
 		}
 	}
 </script>

+ 44 - 10
pages/mall/detail/index.vue

xqd xqd xqd xqd
@@ -239,12 +239,27 @@
 					// 动态生成用于判断选中激活项的对象
 					let saveCheckedObj = {}
 					Object.keys(this.skuParams.attrs).forEach((item, index) => {
-						saveCheckedObj[item] = null
+						// saveCheckedObj[item] = null
+						// saveCheckedObj[item] = this.skuParams.attrs[item][0]
 					})
+
+
+					console.log('this.skuParams-----', this.skuParams);
 					this.saveCheckedObj = saveCheckedObj
 					// 动态生成用于判断sku参数是否全部选中的中间数组
 					this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(0)
+					// this.fullCheckArr = new Array(Object.keys(this.skuParams.attrs).length).fill(1)
+					this.totalPrice = this.skuParams.sku[0].price
 
+					// this.handleC(Object.keys(this.skuParams.attrs)[0], 0, this.skuParams.attrs[Object.keys(this
+					// 	.skuParams.attrs)[0]][
+					// 	0
+					// ])
+
+					// this.handleC(Object.keys(this.skuParams.attrs)[0], 0, this.skuParams.attrs[Object.keys(this
+					// 	.skuParams.attrs)[1]][
+					// 	0
+					// ])
 
 					this.content = res.data
 					this.bannerList = res.data.images
@@ -265,22 +280,28 @@
 		},
 
 		watch: {
+			// watchValue: {
+			// 	handler(n, o) {
+			// 		let showPrice = this.fullCheckArr.every((item, index) => {
+			// 			return item == 1
+			// 		})
+			// 		if (showPrice) {
+			// 			this.calcPrice()
+			// 			// console.log('所求价格:', filterResult[0].price);
+			// 		}
+			// 	},
+			// 	immediate: true
+			// }
+
 			watchValue(n, o) {
 				let showPrice = this.fullCheckArr.every((item, index) => {
 					return item == 1
 				})
 				if (showPrice) {
-					const filterResult = this.skuParams.sku.filter(item => {
-						return this.conditions.every(condition => {
-							const attrValues = this.skuParams.attrs[condition.key];
-							return attrValues.includes(item[condition.key]) && item[condition.key] ===
-								condition.value;
-						});
-					});
-
-					this.totalPrice = filterResult[0].price * this.cutdownRatio
+					this.calcPrice()
 					// console.log('所求价格:', filterResult[0].price);
 				}
+
 			}
 		},
 		onShow() {
@@ -298,6 +319,17 @@
 			}
 		},
 		methods: {
+			calcPrice() {
+				const filterResult = this.skuParams.sku.filter(item => {
+					return this.conditions.every(condition => {
+						const attrValues = this.skuParams.attrs[condition.key];
+						return attrValues.includes(item[condition.key]) && item[condition.key] ===
+							condition.value;
+					});
+				});
+
+				this.totalPrice = filterResult[0].price * this.cutdownRatio
+			},
 			testShare() {
 				console.log('parmsList', this.parmsList);
 				let ids = []
@@ -312,6 +344,8 @@
 				console.log('选中的二维iindex数组', ids);
 			},
 			handleC(item, index, item1) {
+				console.log('handleC参数----------', item, index, item1);
+
 				this.fullCheckArr[index] = 1
 
 				// 声东击西强行触发监听

+ 49 - 30
pages/my.vue

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -1,6 +1,7 @@
 <template>
 
-	<view class="container" v-if="!loading" style="position: relative;z-index: 0;">
+	<!-- <view class="container" v-if="!loading" style="position: relative;z-index: 0;"> -->
+	<view class="container" style="position: relative;z-index: 0;">
 		<navBar title="GIGESI 吉格斯" :back="false" color="black"
 			background="linear-gradient(to bottom,#FDEDD2,#FEF9ED)" />
 		<view class="content">
@@ -16,12 +17,12 @@
 						</view>
 						<text class="btn" v-if="!token" @click="login">请点击登录</text>
 						<text class="btn" v-if="token&&role=='cydg'"
-							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(产业电工)'}}</text>
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname+'(产业电工)':'默认用户(产业电工)'}}</text>
 						<text class="btn" v-if="token&&role=='hy'"
-							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(会员)'}}</text>
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname+'(会员)':'默认用户(会员)'}}</text>
 
 						<view class="lMember" v-if="token&&role=='lhy'" style="" @click="toPage('info')">
-							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(L会员)'}}</text>
+							<text class="btn1">{{userInfo.nickname?userInfo.nickname+'(L会员)':'默认用户(L会员)'}}</text>
 							<view class="botDes" style="width: 450rpx;">
 								查看商品会员价,{{hours}}小时后自动恢复为售价。会员价格还剩
 								<view class="" style="display: inline-block;margin-left: 10rpx;">
@@ -31,44 +32,44 @@
 							</view>
 						</view>
 						<view class="lMember" v-if="token&&role=='hdyh'" @click="toPage('info')">
-							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(活动会员)'}}</text>
+							<text class="btn1">{{userInfo.nickname?userInfo.nickname+'(活动会员)':'默认用户(活动会员)'}}</text>
 							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
 							</view>
 						</view>
 
 						<view class="lMember" v-if="token&&role=='svip'" @click="toPage('info')">
-							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(S-VIP)'}}</text>
+							<text class="btn1">{{userInfo.nickname?userInfo.nickname+'(S-VIP)':'默认用户(S-VIP)'}}</text>
 							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
 							</view>
 						</view>
 
 						<view class="lMember" v-if="token&&role=='gvip'" @click="toPage('info')">
-							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(G-VIP)'}}</text>
+							<text class="btn1">{{userInfo.nickname?userInfo.nickname+'(G-VIP)':'默认用户(G-VIP)'}}</text>
 							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
 							</view>
 						</view>
 						<view class="lMember" v-if="token&&role=='yk'" @click="toPage('info')">
-							<text class="btn1">{{userInfo.nickname?userInfo.nickname:'默认用户(游客)'}}</text>
+							<text class="btn1">{{userInfo.nickname?userInfo.nickname+'(游客)':'默认用户(游客)'}}</text>
 							<view class="botDes" v-if="userInfo.phone">
 								{{userInfo.phone}}
 							</view>
 						</view>
 
 						<text class="btn" v-if="token&&role=='sjkf'"
-							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(设计客服)'}}</text>
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname+'(设计客服)':'默认用户(设计客服)'}}</text>
 						<text class="btn" v-if="token&&role=='shkf'"
-							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(售后客服)'}}</text>
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname+'(售后客服)':'默认用户(售后客服)'}}</text>
 						<text class="btn" v-if="token&&role=='yw'"
-							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(业务客服)'}}</text>
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname+'(业务客服)':'默认用户(业务客服)'}}</text>
 
 						<text class="btn" v-if="token&&role=='superAdmin'"
-							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(超级管理员)'}}</text>
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname+'(超级管理员)':'默认用户(超级管理员)'}}</text>
 
 						<text class="btn" v-if="token&&role=='nomal'"
-							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname:'默认用户(普通员工)'}}</text>
+							@click="toPage('info')">{{userInfo.nickname?userInfo.nickname+'(普通员工)':'默认用户(普通员工)'}}</text>
 					</view>
 					<image :src="picUrl+'/static/my/set2.png'" mode="" @click="toPage('info')"
 						style="width: 37rpx;height: 41rpx;margin-right: 22rpx;">
@@ -113,7 +114,7 @@
 		<u-action-sheet :actions="list" :title="title" :show="show" cancelText="取消" @close="show=false"
 			@select="handleSel"></u-action-sheet>
 	</view>
-	<u-loading-page v-else :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page>
+	<!-- <u-loading-page v-else :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page> -->
 </template>
 
 <script>
@@ -226,9 +227,9 @@
 					}
 
 
-					// this.role = 'hdyh'
-					// this.checkRole()
-					// return
+					this.role = 'superAdmin'
+					this.checkRole()
+					return
 					if (res.data.status) {
 						switch (res.data.type) {
 							case 0:
@@ -446,7 +447,7 @@
 					if (this.userInfo.role == 1) {
 						this.serList.push({
 							icon: this.picUrl + '/static/my/tg.png',
-							name: '团购商品',
+							name: '活动商品',
 							url: '/pages/my/actGoods/index'
 						})
 					} else if (this.userInfo.role == 2) {
@@ -489,7 +490,7 @@
 					if (this.userInfo.role == 1) {
 						this.serList.push({
 							icon: this.picUrl + '/static/my/tg.png',
-							name: '团购商品',
+							name: '活动商品',
 							url: '/pages/my/actGoods/index'
 						})
 					} else if (this.userInfo.role == 2) {
@@ -531,7 +532,7 @@
 					if (this.userInfo.role == 1) {
 						this.serList.push({
 							icon: this.picUrl + '/static/my/tg.png',
-							name: '团购商品',
+							name: '活动商品',
 							url: '/pages/my/actGoods/index'
 						})
 					} else if (this.userInfo.role == 2) {
@@ -571,7 +572,7 @@
 					if (this.userInfo.role == 1) {
 						this.serList.push({
 							icon: this.picUrl + '/static/my/tg.png',
-							name: '团购商品',
+							name: '活动商品',
 							url: '/pages/my/actGoods/index'
 						})
 					} else if (this.userInfo.role == 2) {
@@ -611,7 +612,7 @@
 					if (this.userInfo.role == 1) {
 						this.serList.push({
 							icon: this.picUrl + '/static/my/tg.png',
-							name: '团购商品',
+							name: '活动商品',
 							url: '/pages/my/actGoods/index'
 						})
 					} else if (this.userInfo.role == 2) {
@@ -642,6 +643,16 @@
 							name: '小程序使用指南',
 							url: '/pages/my/useLead/index'
 						},
+						{
+							icon: this.picUrl + '/static/my/jiang.png',
+							name: '兑奖记录',
+							url: '/pages/my/duijiang/index?from=1'
+						},
+						// {
+						// 	icon: this.picUrl + '/static/my/qt.png',
+						// 	name: '兑奖记录',
+						// 	url: '/pages/my/recordCydg/index'
+						// },
 						// {
 						// 	icon: this.picUrl + '/static/other/aboutMe.png',
 						// 	name: '关于我们',
@@ -656,7 +667,7 @@
 					if (this.userInfo.role == 1) {
 						this.serList.push({
 							icon: this.picUrl + '/static/my/tg.png',
-							name: '团购商品',
+							name: '活动商品',
 							url: '/pages/my/actGoods/index'
 						})
 					} else if (this.userInfo.role == 2) {
@@ -671,7 +682,7 @@
 					if (this.userInfo.role == 1) {
 						this.serList.push({
 							icon: this.picUrl + '/static/my/tg.png',
-							name: '团购商品',
+							name: '活动商品',
 							url: '/pages/my/actGoods/index'
 						})
 					} else if (this.userInfo.role == 2) {
@@ -723,13 +734,21 @@
 						},
 						{
 							icon: this.picUrl + '/static/my/tg.png',
-							name: '团购商品',
+							name: '活动商品',
 							url: '/pages/my/actGoods/index'
-						}, {
+						},
+						{
 							icon: this.picUrl + '/static/my/sc.png',
 							name: '收藏',
 							url: '/pages/my/collect/index'
-						}, {
+						},
+
+						{
+							icon: this.picUrl + '/static/my/qt.png',
+							name: '添加售后',
+							url: '/pages/my/inviteSellAfter/index'
+						},
+						{
 							icon: this.picUrl + '/static/my/qt.png',
 							name: '其他信息',
 							url: '/pages/my/otherInfo/index'
@@ -761,7 +780,7 @@
 							},
 							{
 								icon: this.picUrl + '/static/my/tg.png',
-								name: '团购商品',
+								name: '活动商品',
 								url: '/pages/my/actGoods/index'
 							},
 							{
@@ -782,7 +801,7 @@
 								url: '/pages/my/sellAfter/index'
 							}, {
 								icon: this.picUrl + '/static/my/tg.png',
-								name: '团购商品',
+								name: '活动商品',
 								url: '/pages/my/actGoods/index'
 							}, {
 								icon: this.picUrl + '/static/my/sc.png',
@@ -814,7 +833,7 @@
 							url: '/pages/my/sellAfter/index'
 						}, {
 							icon: this.picUrl + '/static/my/tg.png',
-							name: '团购商品',
+							name: '活动商品',
 							url: '/pages/my/actGoods/index'
 						}, {
 							icon: this.picUrl + '/static/my/sc.png',

+ 9 - 3
pages/my/duijiang/index.vue

xqd xqd
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<navBar title="兑奖信息" :back="true" color="black" background="white" />
+		<navBar :title="from==0?'兑奖信息':'兑奖记录'" :back="true" color="black" background="white" />
 
 		<view class="content" v-if="list.length!=0">
 			<view class="item" v-for="(item,index) in list">
@@ -77,10 +77,16 @@
 				picUrl: this.$picUrl,
 				picBase: this.$picBase,
 				list: [],
-				loading: true
+				loading: true,
+
+				from: 0
 			}
 		},
-		async onLoad(options) {
+		async onLoad(o) {
+			if (o.from) {
+				this.from = o.from
+			}
+
 			let res = await getAwardDataReq()
 			if (res.code == 0) {
 				console.log('获取我的兑奖信息返回值: ', res);

+ 45 - 3
pages/my/feedBack/index.vue

xqd xqd xqd xqd xqd
@@ -42,9 +42,10 @@
 			</view>
 			<input type="number" class="phone" placeholder="电话" v-model="phone" style="">
 		</view>
-		<view class="btn_bottom" @click="post()">
+		<view class="btn_bottom" @click="post()" v-if="showCBtn">
 			确定
 		</view>
+		<privacy-popup @confirmP="confirmP" @cancleP="cancleP" :showPrivateBox="showPop"></privacy-popup>
 	</view>
 </template>
 
@@ -53,12 +54,16 @@
 	import {
 		submitFeedbackReq,
 	} from '@/api/test/index.js'
+	import PrivacyPopup from "@/components/privacyPopup/index.vue";
 	export default {
 		components: {
-
+			PrivacyPopup
 		},
 		data() {
 			return {
+				showPop: false,
+				showCBtn: false,
+
 				picUrl: this.$picUrl,
 				content: '',
 				phone: '',
@@ -66,7 +71,35 @@
 			}
 		},
 		onLoad(options) {},
+		onShow() {
+			this.handlePrivate()
+		},
 		methods: {
+
+			cancleP() {
+				this.showPop = false
+				this.showCBtn = true
+			},
+			handlePrivate() {
+				let _this = this
+
+				if (getApp().globalData.showPrivacy) {
+
+					_this.showPop = true
+
+				} else {
+					_this.showPop = false
+					this.showCBtn = true
+				}
+			},
+
+			// 用户同意隐私内容
+			confirmP() {
+				this.showPop = false
+				this.showCBtn = true
+				this.handleUpImg()
+
+			},
 			async post() {
 				let phoneReg = /^[1][3,4,5,7,8,9][0-9]{9}$/
 				if (this.content == '') {
@@ -122,6 +155,15 @@
 			},
 			// 新增图片
 			addquesPic() {
+				if (getApp().globalData.showPrivacy) {
+
+					this.showPop = true
+					this.showCBtn = false
+					return
+				}
+				this.handleUpImg()
+			},
+			handleUpImg() {
 				let _this = this
 				let imgList = []
 				uni.chooseImage({
@@ -160,7 +202,7 @@
 						}
 					}
 				})
-			},
+			}
 		}
 	}
 </script>

+ 20 - 0
pages/my/inviteSellAfter/index.scss

xqd
@@ -0,0 +1,20 @@
+.content{
+	background: #F1F1F1;
+	min-height: 100vh;
+	padding: 0 32rpx;
+	padding-top: 54rpx;
+	padding-bottom: 24rpx;
+	.item{
+		margin-bottom: 50rpx;
+		.label{
+			margin-bottom: 10rpx;
+		}
+	}
+	.orderBtn{
+		margin-top: 100rpx;
+		background: orange;
+		border: none;
+		color: white;
+	}
+	
+}

+ 51 - 0
pages/my/inviteSellAfter/index.vue

xqd
@@ -0,0 +1,51 @@
+<template>
+	<view class="page">
+		<navBar title="添加售后" :back="true" color="black" background="white" />
+
+		<view class="content">
+			<view class="item">
+				<view class="label">
+					*姓名
+				</view>
+				<u--input clearable placeholder="请输入姓名" border="surround" v-model="y_xm" @change="change"></u--input>
+			</view>
+			<view class="item">
+				<view class="label">
+					*电话
+				</view>
+				<u--input clearable placeholder="请输入电话" border="surround" v-model="y_dh" @change="change"></u--input>
+			</view>
+			<view class="item" style="margin-bottom: 24rpx;">
+				<view class="label">
+					项目名称
+				</view>
+				<u--input clearable placeholder="请输入项目名称" border="surround" v-model="l_xmmc"
+					@change="change"></u--input>
+			</view>
+			<button open-type="share" class="orderBtn" :plain="true">
+				确定
+			</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		onLoad(options) {},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

+ 2 - 1
pages/my/chapinShip/index.scss → pages/my/recordCydg/index.scss

xqd
@@ -5,7 +5,8 @@
 	padding-top: 24rpx;
 	padding-bottom: 24rpx;
 	.item{
-		height: 432rpx;
+		// height: 432rpx;
+		height: 300rpx;
 		background: #FFFFFF;
 		border-radius: 0rpx 24rpx 0rpx 24rpx;
 		// margin-top: 24rpx;

+ 9 - 9
pages/my/chapinShip/index.vue → pages/my/recordCydg/index.vue

xqd xqd xqd xqd
@@ -1,9 +1,9 @@
 <template>
 	<view class="page">
-		<navBar title="兑奖信息" :back="true" color="black" background="white" />
+		<navBar title="邀请记录" :back="true" color="black" background="white" />
 
 		<view class="content">
-			<view class="item" v-for="i in 6">
+			<view class="item" v-for="i in 2">
 				<view class="line">
 					<view class="left">
 						姓名
@@ -14,7 +14,7 @@
 				</view>
 				<view class="line">
 					<view class="left">
-						手机号
+						电话
 					</view>
 					<view class="right">
 						12930827830
@@ -22,21 +22,21 @@
 				</view>
 				<view class="line">
 					<view class="left">
-						兑奖信息
+						来源
 					</view>
 					<view class="right">
-						无主灯灯具一件
+						到店
 					</view>
 				</view>
 				<view class="line">
 					<view class="left">
-						联系电话
+						兑奖信息
 					</view>
 					<view class="right">
-						19820983290
+						无主灯灯具一件
 					</view>
 				</view>
-				<view class="line">
+				<!-- <view class="line">
 					<view class="left">
 						是否邀约成功
 					</view>
@@ -51,7 +51,7 @@
 					<view class="right">
 						2023-04-20
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 	</view>

+ 51 - 9
pages/my/userInfo/index.vue

xqd xqd xqd xqd xqd
@@ -86,22 +86,28 @@
 			mode="date" confirmColor="#E77817"></u-datetime-picker>
 
 		<!-- <u-loading-page :loading="loading" image="/static/index/logo.png" loading-text="页面加载中..."></u-loading-page> -->
+
+		<privacy-popup @confirmP="confirmP" @cancleP="cancleP" :showPrivateBox="showPop"></privacy-popup>
 	</view>
 </template>
 
 <script>
 	import uploadUrl from '@/common/config.js'
 	import moment from 'moment'
+	import PrivacyPopup from "@/components/privacyPopup/index.vue";
+	PrivacyPopup
 	import {
 		getUserInfoReq,
 		updateUserInfoReq,
 	} from '@/api/test/index.js'
 	export default {
 		components: {
-
+			PrivacyPopup
 		},
 		data() {
 			return {
+				showPop: false,
+
 				showDate: false,
 				value1: Number(new Date()),
 				picUrl: this.$picUrl,
@@ -124,7 +130,9 @@
 
 			}
 		},
+
 		async onLoad(o) {
+			this.handlePrivate()
 			let res = await getUserInfoReq()
 			if (res.code == 0) {
 				this.userInfo = res.data
@@ -139,6 +147,33 @@
 			}
 		},
 		methods: {
+			cancleP() {
+				this.showPop = false
+			},
+			handlePrivate() {
+				let _this = this
+
+				if (getApp().globalData.showPrivacy) {
+
+					_this.showPop = true
+				} else {
+					_this.showPop = false
+				}
+			},
+
+			// 用户同意隐私内容
+			confirmP() {
+				this.showPop = false
+				let _this = this
+				uni.chooseImage({
+					count: 1,
+					success(res) {
+						console.log('res', res.tempFilePaths[0]);
+						_this.upImg(res.tempFilePaths[0])
+					}
+				})
+
+			},
 			updateNickName() {
 				console.log('昵称输入框的引用--------------', this.$refs);
 				this.focus = true
@@ -216,13 +251,20 @@
 
 			chooseAvatar() {
 				let _this = this
-				uni.chooseImage({
-					count: 1,
-					success(res) {
-						console.log('res', res.tempFilePaths[0]);
-						_this.upImg(res.tempFilePaths[0])
-					}
-				})
+				if (getApp().globalData.showPrivacy) {
+					_this.showPop = true;
+					return;
+				} else {
+					uni.chooseImage({
+						count: 1,
+						success(res) {
+							console.log('res', res.tempFilePaths[0]);
+							_this.upImg(res.tempFilePaths[0])
+						}
+					})
+				}
+
+
 			},
 			upImg(file) {
 				console.log('upImg的file', file)
@@ -251,8 +293,8 @@
 					}
 				})
 			},
-		},
 
+		}
 	}
 </script>
 

+ 1 - 0
unpackage/dist/build/mp-weixin/App.wxml

xqd
@@ -0,0 +1 @@
+<view class="_div"></view>

+ 8 - 1
unpackage/dist/build/mp-weixin/app.json

xqd xqd xqd
@@ -49,7 +49,7 @@
       "pages": [
         "actGoods/index",
         "actGoodsDetail/index",
-        "chapinShip/index",
+        "recordCydg/index",
         "collect/index",
         "useLead/index",
         "feedBack/index",
@@ -67,6 +67,7 @@
         "protocol/index",
         "duijiang/index",
         "actDetail2/index",
+        "inviteSellAfter/index",
         "test/index"
       ]
     }
@@ -145,6 +146,12 @@
   "permission": {
     "scope.userLocation": {
       "desc": "用于小程序使用中为您提供位置信息"
+    },
+    "scope.writePhotosAlbum": {
+      "desc": "你的相册将用于选择上传你的个人头像"
+    },
+    "scope.camera": {
+      "desc": "你的摄像头将用于选择上传你的个人头像"
     }
   },
   "requiredPrivateInfos": [

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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/common/vendor.js


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


+ 1 - 1
unpackage/dist/build/mp-weixin/components/navBar/index.wxml

xqd
@@ -1 +1 @@
-<view class="navbar data-v-3ee39edc" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'+('background:'+(background)+';')}}"><view class="narbar-flexd data-v-3ee39edc" style="{{'background:'+(background)+';'}}"><view style="{{'height:'+(statusBarHeight+'px')+';'}}" class="data-v-3ee39edc"></view><view class="narbar-content data-v-3ee39edc" style="{{'height:'+(navBareight+'px')+';'+('justify-content:'+(flex=='cen'?'center':'')+';')}}"><block wx:if="{{back}}"><view data-event-opts="{{[['tap',[['onBack',['$event']]]]]}}" class="left data-v-3ee39edc" style="{{'color:'+(color)+';'+('padding-top:'+(paddingTop)+';')}}" bindtap="__e"><uni-icons vue-id="3a6d4f98-1" type="arrowleft" size="25" color="{{color}}" class="data-v-3ee39edc" bind:__l="__l"></uni-icons></view></block><block wx:if="{{!back&&navImg}}"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="left data-v-3ee39edc" bindtap="__e"><image style="width:40rpx;height:40rpx;margin-right:8rpx;" showLoading="{{true}}" src="{{navImg}}" data-event-opts="{{[['tap',[['',['$event']]]]]}}" bindtap="__e" class="data-v-3ee39edc"></image></view></block><block wx:if="{{title}}"><view class="title data-v-3ee39edc" style="{{'color:'+(color)+';'}}">{{''+$root.g0+''}}</view></block></view></view><view class="navHeight data-v-3ee39edc" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'}}"></view></view>
+<view class="navbar data-v-7114564d" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'+('background:'+(background)+';')}}"><view class="narbar-flexd data-v-7114564d" style="{{'background:'+(background)+';'}}"><view style="{{'height:'+(statusBarHeight+'px')+';'}}" class="data-v-7114564d"></view><view class="narbar-content data-v-7114564d" style="{{'height:'+(navBareight+'px')+';'+('justify-content:'+(flex=='cen'?'center':'')+';')}}"><block wx:if="{{back}}"><view data-event-opts="{{[['tap',[['onBack',['$event']]]]]}}" class="left data-v-7114564d" style="{{'color:'+(color)+';'+('padding-top:'+(paddingTop)+';')}}" bindtap="__e"><uni-icons vue-id="3a6d4f98-1" type="arrowleft" size="25" color="{{color}}" class="data-v-7114564d" bind:__l="__l"></uni-icons></view></block><block wx:if="{{!back&&navImg}}"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="left data-v-7114564d" bindtap="__e"><image style="width:40rpx;height:40rpx;margin-right:8rpx;" showLoading="{{true}}" src="{{navImg}}" data-event-opts="{{[['tap',[['',['$event']]]]]}}" bindtap="__e" class="data-v-7114564d"></image></view></block><block wx:if="{{title}}"><view class="title data-v-7114564d" style="{{'color:'+(color)+';'}}">{{''+$root.g0+''}}</view></block></view></view><view class="navHeight data-v-7114564d" style="{{'height:'+(statusBarHeight+navBareight+'px')+';'}}"></view></view>

+ 1 - 1
unpackage/dist/build/mp-weixin/components/navBar/index.wxss

xqd
@@ -1 +1 @@
-.navbar.data-v-3ee39edc{background:green;position:relative}.navbar .narbar-flexd.data-v-3ee39edc{background:green;position:fixed;top:0;left:0;z-index:99;width:100%}.navbar .narbar-flexd .narbar-content.data-v-3ee39edc{padding:0 40rpx;display:flex;box-sizing:border-box;align-items:center}.navbar .narbar-flexd .narbar-content .left.data-v-3ee39edc{font-weight:600;display:flex;align-items:center}.navbar .narbar-flexd .narbar-content .title.data-v-3ee39edc{font-size:16px;color:#fff;font-weight:600}.navbar .navHeight.data-v-3ee39edc{height:60px}
+.navbar.data-v-7114564d{background:green;position:relative}.navbar .narbar-flexd.data-v-7114564d{background:green;position:fixed;top:0;left:0;z-index:99;width:100%}.navbar .narbar-flexd .narbar-content.data-v-7114564d{padding:0 40rpx;display:flex;box-sizing:border-box;align-items:center}.navbar .narbar-flexd .narbar-content .left.data-v-7114564d{font-weight:600;display:flex;align-items:center}.navbar .narbar-flexd .narbar-content .title.data-v-7114564d{font-size:16px;color:#fff;font-weight:600}.navbar .navHeight.data-v-7114564d{height:60px}

+ 2 - 2
unpackage/dist/build/mp-weixin/components/popup/index.js

xqd
@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/popup/index"],{"1d23":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={props:["show","mode","round","dtitle"],methods:{close:function(){this.$emit("close")},open:function(){this.$emit("open")}}}},"30de":function(n,e,t){"use strict";var u=t("47a5"),o=t.n(u);o.a},"47a5":function(n,e,t){},"85fd":function(n,e,t){"use strict";t.r(e);var u=t("d4e5"),o=t("8cea");for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);t("30de");var c=t("f0c5"),r=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"7dea3bec",null,!1,u["a"],void 0);e["default"]=r.exports},"8cea":function(n,e,t){"use strict";t.r(e);var u=t("1d23"),o=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=o.a},d4e5:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(t.bind(null,"50d6"))}},o=function(){var n=this.$createElement;this._self._c},i=[]}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/popup/index"],{4134:function(n,t,e){"use strict";e.r(t);var u=e("909a"),o=e("8900");for(var i in o)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return o[n]}))}(i);e("aba9");var a=e("f0c5"),c=Object(a["a"])(o["default"],u["b"],u["c"],!1,null,"7dea3bec",null,!1,u["a"],void 0);t["default"]=c.exports},"52a2":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={props:["show","mode","round","dtitle"],methods:{close:function(){this.$emit("close")},open:function(){this.$emit("open")}}}},8900:function(n,t,e){"use strict";e.r(t);var u=e("52a2"),o=e.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(i);t["default"]=o.a},"909a":function(n,t,e){"use strict";e.d(t,"b",(function(){return o})),e.d(t,"c",(function(){return i})),e.d(t,"a",(function(){return u}));var u={uPopup:function(){return Promise.all([e.e("common/vendor"),e.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(e.bind(null,"9f39"))}},o=function(){var n=this.$createElement;this._self._c},i=[]},a607:function(n,t,e){},aba9:function(n,t,e){"use strict";var u=e("a607"),o=e.n(u);o.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/popup/index-create-component',
     {
         'components/popup/index-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("85fd"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("4134"))
         })
     },
     [['components/popup/index-create-component']]

+ 2 - 2
unpackage/dist/build/mp-weixin/components/privacyPopup/index.js

xqd
@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/privacyPopup/index"],{"14bf":function(n,t,e){},7923:function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return c})),e.d(t,"a",(function(){return u}));var u={uniPopup:function(){return e.e("uni_modules/uni-popup/components/uni-popup/uni-popup").then(e.bind(null,"1c63"))}},i=function(){var n=this.$createElement;this._self._c},c=[]},"7c5e":function(n,t,e){"use strict";e.r(t);var u=e("7923"),i=e("ec66");for(var c in i)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(c);e("974c");var o=e("f0c5"),r=Object(o["a"])(i["default"],u["b"],u["c"],!1,null,"2f94559f",null,!1,u["a"],void 0);t["default"]=r.exports},"974c":function(n,t,e){"use strict";var u=e("14bf"),i=e.n(u);i.a},b6b5:function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{title:"用户隐私保护提示",desc1:"感谢您使用本产品,您使用本产品前应当仔细阅读并同意",urlTitle:"《小程序隐私保护指引》",desc2:"当您点击同意并开始使用产品服务时,即表示你已理解并同意该条款内容,该条款将对您产生法律约束力。如您拒绝,将无法更好的体验产品。"}},methods:{openPrivacyContract:function(){n.openPrivacyContract({})},handleAgreePrivacyAuthorization:function(){getApp().globalData.showPrivacy=!1,this.$emit("confirm"),this.$refs.popup.close()},handleDisagree:function(){this.$refs.popup.close()}}};t.default=e}).call(this,e("bc2e")["default"])},ec66:function(n,t,e){"use strict";e.r(t);var u=e("b6b5"),i=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=i.a}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["components/privacyPopup/index"],{"04eb":function(n,t,e){"use strict";e.r(t);var u=e("0e59"),i=e.n(u);for(var o in u)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(o);t["default"]=i.a},"0e59":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={data:function(){return{title:"用户隐私保护提示",desc1:"感谢您使用本产品,您使用本产品前应当仔细阅读并同意",urlTitle:"《小程序隐私保护指引》",desc2:"当您点击同意并开始使用产品服务时,即表示你已理解并同意该条款内容,该条款将对您产生法律约束力。如您拒绝,将无法更好的体验产品。"}},methods:{openPrivacyContract:function(){n.openPrivacyContract({})},handleAgreePrivacyAuthorization:function(){getApp().globalData.showPrivacy=!1,this.$emit("confirm"),this.$refs.popup.close()},handleDisagree:function(){this.$refs.popup.close()}}};t.default=e}).call(this,e("bc2e")["default"])},"32c0":function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return o})),e.d(t,"a",(function(){return u}));var u={uniPopup:function(){return e.e("uni_modules/uni-popup/components/uni-popup/uni-popup").then(e.bind(null,"0460"))}},i=function(){var n=this.$createElement;this._self._c},o=[]},5069:function(n,t,e){},"66d8":function(n,t,e){"use strict";e.r(t);var u=e("32c0"),i=e("04eb");for(var o in i)["default"].indexOf(o)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(o);e("79c4");var c=e("f0c5"),r=Object(c["a"])(i["default"],u["b"],u["c"],!1,null,"2f94559f",null,!1,u["a"],void 0);t["default"]=r.exports},"79c4":function(n,t,e){"use strict";var u=e("5069"),i=e.n(u);i.a}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'components/privacyPopup/index-create-component',
     {
         'components/privacyPopup/index-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("7c5e"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("66d8"))
         })
     },
     [['components/privacyPopup/index-create-component']]

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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


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


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/index/rule/index.js

xqd
@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/rule/index"],{"18d0":function(n,e,t){"use strict";var u=t("2247"),o=t.n(u);o.a},"18fe":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={components:{},data:function(){return{content:""}},onLoad:function(n){this.content=getApp().content,console.log(this.content)},methods:{}};e.default=u},2247:function(n,e,t){},"449f":function(n,e,t){"use strict";t.r(e);var u=t("67f5"),o=t("ac81");for(var c in o)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(c);t("18d0");var r=t("f0c5"),a=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"2daba840",null,!1,u["a"],void 0);e["default"]=a.exports},"67f5":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){return u}));var u={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"5d44"))}},o=function(){var n=this.$createElement;this._self._c},c=[]},6953:function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("d716");u(t("66fd"));var o=u(t("449f"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},ac81:function(n,e,t){"use strict";t.r(e);var u=t("18fe"),o=t.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);e["default"]=o.a}},[["6953","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/index/rule/index"],{"29e5":function(n,e,t){},"3e0a":function(n,e,t){"use strict";var u=t("29e5"),o=t.n(u);o.a},"42a5":function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("f331");u(t("66fd"));var o=u(t("ffb4"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"528a":function(n,e,t){"use strict";t.r(e);var u=t("e03e"),o=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);e["default"]=o.a},"9db2":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return u}));var u={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"1614"))}},o=function(){var n=this.$createElement;this._self._c},a=[]},e03e:function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var u={components:{},data:function(){return{content:""}},onLoad:function(n){this.content=getApp().content,console.log(this.content)},methods:{}};e.default=u},ffb4:function(n,e,t){"use strict";t.r(e);var u=t("9db2"),o=t("528a");for(var a in o)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(a);t("3e0a");var r=t("f0c5"),c=Object(r["a"])(o["default"],u["b"],u["c"],!1,null,"2daba840",null,!1,u["a"],void 0);e["default"]=c.exports}},[["42a5","common/runtime","common/vendor"]]]);

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


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


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


File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/mall/detail/index.wxss


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


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/mall/pickKeting/index.js

xqd
@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mall/pickKeting/index"],{"0f7b":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={components:{},data:function(){return{}},onLoad:function(n){},methods:{toDetail:function(){n.navigateTo({url:"/pages/index/mainDetail/index"})}}};e.default=t}).call(this,t("543d")["default"])},"25c3":function(n,e,t){"use strict";t.r(e);var u=t("0f7b"),a=t.n(u);for(var o in u)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(o);e["default"]=a.a},"37dd":function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("d716");u(t("66fd"));var a=u(t("da4b"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"4fb6":function(n,e,t){"use strict";t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return o})),t.d(e,"a",(function(){return u}));var u={uLoadmore:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-loadmore/u-loadmore")]).then(t.bind(null,"c6fd2"))}},a=function(){var n=this.$createElement;this._self._c},o=[]},"77ba":function(n,e,t){"use strict";var u=t("bcc3"),a=t.n(u);a.a},bcc3:function(n,e,t){},da4b:function(n,e,t){"use strict";t.r(e);var u=t("4fb6"),a=t("25c3");for(var o in a)["default"].indexOf(o)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(o);t("77ba");var c=t("f0c5"),i=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"2777f4a6",null,!1,u["a"],void 0);e["default"]=i.exports}},[["37dd","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/mall/pickKeting/index"],{"325f":function(n,e,t){"use strict";t.r(e);var u=t("8cc5"),o=t.n(u);for(var a in u)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(a);e["default"]=o.a},5610:function(n,e,t){},"69d4":function(n,e,t){"use strict";t.r(e);var u=t("702c"),o=t("325f");for(var a in o)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(a);t("c18a");var c=t("f0c5"),i=Object(c["a"])(o["default"],u["b"],u["c"],!1,null,"2777f4a6",null,!1,u["a"],void 0);e["default"]=i.exports},"702c":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return a})),t.d(e,"a",(function(){return u}));var u={uLoadmore:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-loadmore/u-loadmore")]).then(t.bind(null,"1e0c"))}},o=function(){var n=this.$createElement;this._self._c},a=[]},"8cc5":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={components:{},data:function(){return{}},onLoad:function(n){},methods:{toDetail:function(){n.navigateTo({url:"/pages/index/mainDetail/index"})}}};e.default=t}).call(this,t("543d")["default"])},b468:function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("f331");u(t("66fd"));var o=u(t("69d4"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(o.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},c18a:function(n,e,t){"use strict";var u=t("5610"),o=t.n(u);o.a}},[["b468","common/runtime","common/vendor"]]]);

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/map/index.js

xqd
@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/map/index"],{"1d60":function(n,e,t){"use strict";t.r(e);var o=t("9c10"),c=t.n(o);for(var a in o)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(a);e["default"]=c.a},"21ba":function(n,e,t){},"510e":function(n,e,t){"use strict";(function(n,e){var o=t("4ea4");t("d716");o(t("66fd"));var c=o(t("a4d3"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(c.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"615d":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){}));var o=function(){var n=this.$createElement;this._self._c},c=[]},7389:function(n,e,t){"use strict";var o=t("21ba"),c=t.n(o);c.a},"9c10":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o=t("466c"),c={data:function(){return{}},onLoad:function(){new o({key:"W4IBZ-EVOCV-GJVPF-5QVLU-5ZJTJ-CNFUD"})},onShow:function(){},methods:{testQQMap:function(){n.chooseLocation({success:function(e){console.log("位置名称:"+e.name),console.log("详细地址:"+e.address),console.log("纬度:"+e.latitude),console.log("经度:"+e.longitude),n.openLocation({name:e.name,address:e.address,latitude:e.latitude,longitude:e.longitude,success:function(){console.log("success")}})}})}}};e.default=c}).call(this,t("543d")["default"])},a4d3:function(n,e,t){"use strict";t.r(e);var o=t("615d"),c=t("1d60");for(var a in c)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(a);t("7389");var u=t("f0c5"),i=Object(u["a"])(c["default"],o["b"],o["c"],!1,null,"6d7ba81d",null,!1,o["a"],void 0);e["default"]=i.exports}},[["510e","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/map/index"],{"0458":function(n,e,t){},"3c50":function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o=t("7524"),c={data:function(){return{}},onLoad:function(){new o({key:"W4IBZ-EVOCV-GJVPF-5QVLU-5ZJTJ-CNFUD"})},onShow:function(){},methods:{testQQMap:function(){n.chooseLocation({success:function(e){console.log("位置名称:"+e.name),console.log("详细地址:"+e.address),console.log("纬度:"+e.latitude),console.log("经度:"+e.longitude),n.openLocation({name:e.name,address:e.address,latitude:e.latitude,longitude:e.longitude,success:function(){console.log("success")}})}})}}};e.default=c}).call(this,t("543d")["default"])},"501a":function(n,e,t){"use strict";(function(n,e){var o=t("4ea4");t("f331");o(t("66fd"));var c=o(t("663d"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(c.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},6473:function(n,e,t){"use strict";var o=t("0458"),c=t.n(o);c.a},"663d":function(n,e,t){"use strict";t.r(e);var o=t("f090"),c=t("8af0");for(var a in c)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(a);t("6473");var u=t("f0c5"),i=Object(u["a"])(c["default"],o["b"],o["c"],!1,null,"6d7ba81d",null,!1,o["a"],void 0);e["default"]=i.exports},"8af0":function(n,e,t){"use strict";t.r(e);var o=t("3c50"),c=t.n(o);for(var a in o)["default"].indexOf(a)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(a);e["default"]=c.a},f090:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){}));var o=function(){var n=this.$createElement;this._self._c},c=[]}},[["501a","common/runtime","common/vendor"]]]);

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


+ 1 - 2
unpackage/dist/build/mp-weixin/pages/my.json

xqd
@@ -2,7 +2,6 @@
   "navigationBarTitleText": "我的",
   "usingComponents": {
     "u-count-down": "/uni_modules/uview-ui/components/u-count-down/u-count-down",
-    "u-action-sheet": "/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet",
-    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
+    "u-action-sheet": "/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet"
   }
 }

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


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


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/my/aboutMe/index.js

xqd
@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/aboutMe/index"],{"10ed":function(e,n,t){"use strict";(function(e){var a=t("4ea4");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var u=a(t("2eee")),o=a(t("c973")),c=t("3716"),r={components:{},data:function(){return{picBase:this.$picBase,content:null}},onLoad:function(n){var t=this;return(0,o.default)(u.default.mark((function n(){var a;return u.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,(0,c.getAboutReq)();case 2:a=n.sent,0==a.code?(t.content=a.data,console.log("关于我们返回值",t.content)):e.showToast({title:a.message,icon:"none"});case 4:case"end":return n.stop()}}),n)})))()},methods:{}};n.default=r}).call(this,t("543d")["default"])},3628:function(e,n,t){"use strict";(function(e,n){var a=t("4ea4");t("d716");a(t("66fd"));var u=a(t("be5f"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(u.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"5a95":function(e,n,t){},"73fa":function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return o})),t.d(n,"a",(function(){return a}));var a={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"5d44"))}},u=function(){var e=this.$createElement;this._self._c},o=[]},"81ee":function(e,n,t){"use strict";var a=t("5a95"),u=t.n(a);u.a},a847:function(e,n,t){"use strict";t.r(n);var a=t("10ed"),u=t.n(a);for(var o in a)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(o);n["default"]=u.a},be5f:function(e,n,t){"use strict";t.r(n);var a=t("73fa"),u=t("a847");for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);t("81ee");var c=t("f0c5"),r=Object(c["a"])(u["default"],a["b"],a["c"],!1,null,"7c72bc81",null,!1,a["a"],void 0);n["default"]=r.exports}},[["3628","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/aboutMe/index"],{"1e2b":function(e,n,t){"use strict";var u=t("b691"),a=t.n(u);a.a},"3de8":function(e,n,t){"use strict";(function(e){var u=t("4ea4");Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var a=u(t("2eee")),o=u(t("c973")),c=t("646a"),r={components:{},data:function(){return{picBase:this.$picBase,content:null}},onLoad:function(n){var t=this;return(0,o.default)(a.default.mark((function n(){var u;return a.default.wrap((function(n){while(1)switch(n.prev=n.next){case 0:return n.next=2,(0,c.getAboutReq)();case 2:u=n.sent,0==u.code?(t.content=u.data,console.log("关于我们返回值",t.content)):e.showToast({title:u.message,icon:"none"});case 4:case"end":return n.stop()}}),n)})))()},methods:{}};n.default=r}).call(this,t("543d")["default"])},"4a5b":function(e,n,t){"use strict";t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return o})),t.d(n,"a",(function(){return u}));var u={uParse:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-parse/u-parse")]).then(t.bind(null,"1614"))}},a=function(){var e=this.$createElement;this._self._c},o=[]},"780b":function(e,n,t){"use strict";t.r(n);var u=t("4a5b"),a=t("8323");for(var o in a)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(o);t("1e2b");var c=t("f0c5"),r=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"7c72bc81",null,!1,u["a"],void 0);n["default"]=r.exports},8323:function(e,n,t){"use strict";t.r(n);var u=t("3de8"),a=t.n(u);for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);n["default"]=a.a},b691:function(e,n,t){},e027:function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("f331");u(t("66fd"));var a=u(t("780b"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])}},[["e027","common/runtime","common/vendor"]]]);

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


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


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


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


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


+ 0 - 1
unpackage/dist/build/mp-weixin/pages/my/chapinShip/index.js

xqd
@@ -1 +0,0 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/chapinShip/index"],{"2b3f":function(n,t,e){"use strict";e.r(t);var c=e("d253"),u=e("5cbf");for(var f in u)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(f);e("4f88");var a=e("f0c5"),i=Object(a["a"])(u["default"],c["b"],c["c"],!1,null,"6e532b25",null,!1,c["a"],void 0);t["default"]=i.exports},"4f88":function(n,t,e){"use strict";var c=e("cbc2"),u=e.n(c);u.a},"591d":function(n,t,e){"use strict";(function(n,t){var c=e("4ea4");e("d716");c(e("66fd"));var u=c(e("2b3f"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"5cbf":function(n,t,e){"use strict";e.r(t);var c=e("66af"),u=e.n(c);for(var f in c)["default"].indexOf(f)<0&&function(n){e.d(t,n,(function(){return c[n]}))}(f);t["default"]=u.a},"66af":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={components:{},data:function(){return{}},onLoad:function(n){},methods:{}}},cbc2:function(n,t,e){},d253:function(n,t,e){"use strict";e.d(t,"b",(function(){return c})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){}));var c=function(){var n=this.$createElement;this._self._c},u=[]}},[["591d","common/runtime","common/vendor"]]]);

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/my/chapinShip/index.wxml

xqd
@@ -1 +0,0 @@
-<view class="page data-v-6e532b25"><nav-bar vue-id="246f8bd8-1" title="兑奖信息" back="{{true}}" color="black" background="white" class="data-v-6e532b25" bind:__l="__l"></nav-bar><view class="content data-v-6e532b25"><block wx:for="{{6}}" wx:for-item="i" wx:for-index="__i0__"><view class="item data-v-6e532b25"><view class="line data-v-6e532b25"><view class="left data-v-6e532b25">姓名</view><view class="right data-v-6e532b25">王花花</view></view><view class="line data-v-6e532b25"><view class="left data-v-6e532b25">手机号</view><view class="right data-v-6e532b25">12930827830</view></view><view class="line data-v-6e532b25"><view class="left data-v-6e532b25">兑奖信息</view><view class="right data-v-6e532b25">无主灯灯具一件</view></view><view class="line data-v-6e532b25"><view class="left data-v-6e532b25">联系电话</view><view class="right data-v-6e532b25">19820983290</view></view><view class="line data-v-6e532b25"><view class="left data-v-6e532b25">是否邀约成功</view><view class="right data-v-6e532b25">是</view></view><view class="line data-v-6e532b25"><view class="left data-v-6e532b25">时间</view><view class="right data-v-6e532b25">2023-04-20</view></view></view></block></view></view>

+ 0 - 1
unpackage/dist/build/mp-weixin/pages/my/chapinShip/index.wxss

xqd
@@ -1 +0,0 @@
-.content.data-v-6e532b25{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-6e532b25{height:432rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .line.data-v-6e532b25{display:flex;justify-content:space-between}.content .item .line .left.data-v-6e532b25{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-6e532b25{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}

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


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


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


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


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/my/duijiang/index.wxss

xqd
@@ -1 +1 @@
-.data-v-dc7a58d4 .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-dc7a58d4 .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-dc7a58d4{min-height:100vh;background:#f1f1f1}.content.data-v-dc7a58d4{padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-dc7a58d4{height:432rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .line.data-v-dc7a58d4{display:flex;justify-content:space-between}.content .item .line .left.data-v-dc7a58d4{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-dc7a58d4{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}
+.data-v-3894e40b .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-3894e40b .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.page.data-v-3894e40b{min-height:100vh;background:#f1f1f1}.content.data-v-3894e40b{padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-3894e40b{height:432rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .line.data-v-3894e40b{display:flex;justify-content:space-between}.content .item .line .left.data-v-3894e40b{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-3894e40b{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}

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


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


+ 1 - 0
unpackage/dist/build/mp-weixin/pages/my/inviteSellAfter/index.js

xqd
@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/inviteSellAfter/index"],{"0ad0":function(n,e,t){"use strict";(function(n,e){var u=t("4ea4");t("f331");u(t("66fd"));var c=u(t("9d2f"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(c.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},4916:function(n,e,t){"use strict";var u=t("6e81"),c=t.n(u);c.a},"61c3":function(n,e,t){"use strict";t.d(e,"b",(function(){return c})),t.d(e,"c",(function(){return i})),t.d(e,"a",(function(){return u}));var u={"u-Input":function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u--input/u--input")]).then(t.bind(null,"d45f"))}},c=function(){var n=this.$createElement;this._self._c},i=[]},"6e81":function(n,e,t){},"85c6":function(n,e,t){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;e.default={components:{},data:function(){return{}},onLoad:function(n){},methods:{}}},9055:function(n,e,t){"use strict";t.r(e);var u=t("85c6"),c=t.n(u);for(var i in u)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(i);e["default"]=c.a},"9d2f":function(n,e,t){"use strict";t.r(e);var u=t("61c3"),c=t("9055");for(var i in c)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(i);t("4916");var o=t("f0c5"),r=Object(o["a"])(c["default"],u["b"],u["c"],!1,null,"03533d7e",null,!1,u["a"],void 0);e["default"]=r.exports}},[["0ad0","common/runtime","common/vendor"]]]);

+ 7 - 0
unpackage/dist/build/mp-weixin/pages/my/inviteSellAfter/index.json

xqd
@@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "u--input": "/uni_modules/uview-ui/components/u--input/u--input"
+  }
+}

+ 1 - 0
unpackage/dist/build/mp-weixin/pages/my/inviteSellAfter/index.wxml

xqd
@@ -0,0 +1 @@
+<view class="page data-v-03533d7e"><nav-bar vue-id="a7f970e8-1" title="添加售后" back="{{true}}" color="black" background="white" class="data-v-03533d7e" bind:__l="__l"></nav-bar><view class="content data-v-03533d7e"><view class="item data-v-03533d7e"><view class="label data-v-03533d7e">*姓名</view><u--input vue-id="a7f970e8-2" clearable="{{true}}" placeholder="请输入姓名" border="surround" value="{{y_xm}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','y_xm','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-03533d7e" bind:__l="__l"></u--input></view><view class="item data-v-03533d7e"><view class="label data-v-03533d7e">*电话</view><u--input vue-id="a7f970e8-3" clearable="{{true}}" placeholder="请输入电话" border="surround" value="{{y_dh}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','y_dh','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-03533d7e" bind:__l="__l"></u--input></view><view class="item data-v-03533d7e" style="margin-bottom:24rpx;"><view class="label data-v-03533d7e">项目名称</view><u--input vue-id="a7f970e8-4" clearable="{{true}}" placeholder="请输入项目名称" border="surround" value="{{l_xmmc}}" data-event-opts="{{[['^change',[['change']]],['^input',[['__set_model',['','l_xmmc','$event',[]]]]]]}}" bind:change="__e" bind:input="__e" class="data-v-03533d7e" bind:__l="__l"></u--input></view><button class="orderBtn data-v-03533d7e" open-type="share" plain="{{true}}">确定</button></view></view>

+ 1 - 0
unpackage/dist/build/mp-weixin/pages/my/inviteSellAfter/index.wxss

xqd
@@ -0,0 +1 @@
+.content.data-v-03533d7e{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:54rpx;padding-bottom:24rpx}.content .item.data-v-03533d7e{margin-bottom:50rpx}.content .item .label.data-v-03533d7e{margin-bottom:10rpx}.content .orderBtn.data-v-03533d7e{margin-top:100rpx;background:orange;border:none;color:#fff}

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/my/otherInfo/index.js

xqd
@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/otherInfo/index"],{"28b1":function(n,e,t){"use strict";t.d(e,"b",(function(){return a})),t.d(e,"c",(function(){return u})),t.d(e,"a",(function(){}));var a=function(){var n=this.$createElement;this._self._c},u=[]},"3f81":function(n,e,t){"use strict";(function(n,e){var a=t("4ea4");t("d716");a(t("66fd"));var u=a(t("fc46"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(u.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},8125:function(n,e,t){},ae7c:function(n,e,t){"use strict";var a=t("8125"),u=t.n(a);u.a},e0ea:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var t={components:{},data:function(){return{value:0,value1:0,value2:0}},onLoad:function(n){},methods:{toPage:function(e){n.navigateTo({url:e})},change:function(){}}};e.default=t}).call(this,t("543d")["default"])},f135:function(n,e,t){"use strict";t.r(e);var a=t("e0ea"),u=t.n(a);for(var c in a)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return a[n]}))}(c);e["default"]=u.a},fc46:function(n,e,t){"use strict";t.r(e);var a=t("28b1"),u=t("f135");for(var c in u)["default"].indexOf(c)<0&&function(n){t.d(e,n,(function(){return u[n]}))}(c);t("ae7c");var f=t("f0c5"),o=Object(f["a"])(u["default"],a["b"],a["c"],!1,null,"592cd4e9",null,!1,a["a"],void 0);e["default"]=o.exports}},[["3f81","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/otherInfo/index"],{"13f4":function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f331");u(e("66fd"));var a=u(e("d9bd"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"60a2":function(n,t,e){"use strict";(function(n){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var e={components:{},data:function(){return{value:0,value1:0,value2:0}},onLoad:function(n){},methods:{toPage:function(t){n.navigateTo({url:t})},change:function(){}}};t.default=e}).call(this,e("543d")["default"])},"7e6b":function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},8569:function(n,t,e){"use strict";var u=e("f30d"),a=e.n(u);a.a},"98d7":function(n,t,e){"use strict";e.r(t);var u=e("60a2"),a=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=a.a},d9bd:function(n,t,e){"use strict";e.r(t);var u=e("7e6b"),a=e("98d7");for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);e("8569");var o=e("f0c5"),f=Object(o["a"])(a["default"],u["b"],u["c"],!1,null,"592cd4e9",null,!1,u["a"],void 0);t["default"]=f.exports},f30d:function(n,t,e){}},[["13f4","common/runtime","common/vendor"]]]);

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


+ 1 - 0
unpackage/dist/build/mp-weixin/pages/my/recordCydg/index.js

xqd
@@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/recordCydg/index"],{"0f96":function(n,t,e){"use strict";e.r(t);var u=e("8631"),a=e("3c32");for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);e("b555");var f=e("f0c5"),r=Object(f["a"])(a["default"],u["b"],u["c"],!1,null,"2a872552",null,!1,u["a"],void 0);t["default"]=r.exports},"3c32":function(n,t,e){"use strict";e.r(t);var u=e("f18f"),a=e.n(u);for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);t["default"]=a.a},8631:function(n,t,e){"use strict";e.d(t,"b",(function(){return u})),e.d(t,"c",(function(){return a})),e.d(t,"a",(function(){}));var u=function(){var n=this.$createElement;this._self._c},a=[]},"881b":function(n,t,e){"use strict";(function(n,t){var u=e("4ea4");e("f331");u(e("66fd"));var a=u(e("0f96"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(a.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},b555:function(n,t,e){"use strict";var u=e("e0aa"),a=e.n(u);a.a},e0aa:function(n,t,e){},f18f:function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={components:{},data:function(){return{}},onLoad:function(n){},methods:{}}}},[["881b","common/runtime","common/vendor"]]]);

+ 0 - 0
unpackage/dist/build/mp-weixin/pages/my/chapinShip/index.json → unpackage/dist/build/mp-weixin/pages/my/recordCydg/index.json


+ 1 - 0
unpackage/dist/build/mp-weixin/pages/my/recordCydg/index.wxml

xqd
@@ -0,0 +1 @@
+<view class="page data-v-2a872552"><nav-bar vue-id="4517ecdf-1" title="邀请记录" back="{{true}}" color="black" background="white" class="data-v-2a872552" bind:__l="__l"></nav-bar><view class="content data-v-2a872552"><block wx:for="{{2}}" wx:for-item="i" wx:for-index="__i0__"><view class="item data-v-2a872552"><view class="line data-v-2a872552"><view class="left data-v-2a872552">姓名</view><view class="right data-v-2a872552">王花花</view></view><view class="line data-v-2a872552"><view class="left data-v-2a872552">电话</view><view class="right data-v-2a872552">12930827830</view></view><view class="line data-v-2a872552"><view class="left data-v-2a872552">来源</view><view class="right data-v-2a872552">到店</view></view><view class="line data-v-2a872552"><view class="left data-v-2a872552">兑奖信息</view><view class="right data-v-2a872552">无主灯灯具一件</view></view></view></block></view></view>

+ 1 - 0
unpackage/dist/build/mp-weixin/pages/my/recordCydg/index.wxss

xqd
@@ -0,0 +1 @@
+.content.data-v-2a872552{background:#f1f1f1;min-height:100vh;padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-2a872552{height:300rpx;background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;justify-content:space-around;margin-bottom:24rpx}.content .item .line.data-v-2a872552{display:flex;justify-content:space-between}.content .item .line .left.data-v-2a872552{font-size:28rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#666}.content .item .line .right.data-v-2a872552{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333}

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/my/sellAfter/index.js

xqd
@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/sellAfter/index"],{"1c89":function(e,n,t){"use strict";t.d(n,"b",(function(){return a})),t.d(n,"c",(function(){return o})),t.d(n,"a",(function(){return u}));var u={uActionSheet:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-action-sheet/u-action-sheet")]).then(t.bind(null,"3734"))}},a=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){e.showSheet=!1})},o=[]},"25c6":function(e,n,t){"use strict";var u=t("7ae1"),a=t.n(u);a.a},"3b65":function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={components:{},data:function(){return{value:0,value1:0,value2:0,showSheet:!1,list:[{name:"换新商城"},{name:"换新流程"}]}},onLoad:function(e){},methods:{change:function(){},toPage:function(){this.showSheet=!0},handleSel:function(n){this.showSheet=!1,"换新商城"==n.name?e.navigateTo({url:"/pages/my/changeNewGoods/index"}):(getApp().stepName="换新流程",e.navigateTo({url:"/pages/my/changeNewStep/index"}))}}};n.default=t}).call(this,t("543d")["default"])},"72b6":function(e,n,t){"use strict";(function(e,n){var u=t("4ea4");t("d716");u(t("66fd"));var a=u(t("9c8c"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(a.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},"7ae1":function(e,n,t){},"9c8c":function(e,n,t){"use strict";t.r(n);var u=t("1c89"),a=t("bb8f");for(var o in a)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(o);t("25c6");var c=t("f0c5"),i=Object(c["a"])(a["default"],u["b"],u["c"],!1,null,"b5d0b420",null,!1,u["a"],void 0);n["default"]=i.exports},bb8f:function(e,n,t){"use strict";t.r(n);var u=t("3b65"),a=t.n(u);for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);n["default"]=a.a}},[["72b6","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/sellAfter/index"],{"1fae":function(e,n,t){"use strict";t.d(n,"b",(function(){return u})),t.d(n,"c",(function(){return o})),t.d(n,"a",(function(){return a}));var a={uActionSheet:function(){return Promise.all([t.e("common/vendor"),t.e("uni_modules/uview-ui/components/u-action-sheet/u-action-sheet")]).then(t.bind(null,"0a17"))}},u=function(){var e=this,n=e.$createElement;e._self._c;e._isMounted||(e.e0=function(n){e.showSheet=!1})},o=[]},"32be":function(e,n,t){"use strict";(function(e,n){var a=t("4ea4");t("f331");a(t("66fd"));var u=a(t("5621"));e.__webpack_require_UNI_MP_PLUGIN__=t,n(u.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},5621:function(e,n,t){"use strict";t.r(n);var a=t("1fae"),u=t("a148");for(var o in u)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return u[e]}))}(o);t("8ddb");var i=t("f0c5"),c=Object(i["a"])(u["default"],a["b"],a["c"],!1,null,"b5d0b420",null,!1,a["a"],void 0);n["default"]=c.exports},"8ddb":function(e,n,t){"use strict";var a=t("b5a4"),u=t.n(a);u.a},a148:function(e,n,t){"use strict";t.r(n);var a=t("a80c"),u=t.n(a);for(var o in a)["default"].indexOf(o)<0&&function(e){t.d(n,e,(function(){return a[e]}))}(o);n["default"]=u.a},a80c:function(e,n,t){"use strict";(function(e){Object.defineProperty(n,"__esModule",{value:!0}),n.default=void 0;var t={components:{},data:function(){return{value:0,value1:0,value2:0,showSheet:!1,list:[{name:"换新商城"},{name:"换新流程"}]}},onLoad:function(e){},methods:{change:function(){},toPage:function(){this.showSheet=!0},handleSel:function(n){this.showSheet=!1,"换新商城"==n.name?e.navigateTo({url:"/pages/my/changeNewGoods/index"}):(getApp().stepName="换新流程",e.navigateTo({url:"/pages/my/changeNewStep/index"}))}}};n.default=t}).call(this,t("543d")["default"])},b5a4:function(e,n,t){}},[["32be","common/runtime","common/vendor"]]]);

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


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


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


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/my/test/index.js

xqd
@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/test/index"],{"27fa":function(n,t,e){"use strict";(function(n,t){var a=e("4ea4");e("d716");a(e("66fd"));var u=a(e("79b2"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},3058:function(n,t,e){"use strict";var a=e("e65b"),u=e.n(a);u.a},6595:function(n,t,e){"use strict";e.r(t);var a=e("881b"),u=e.n(a);for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);t["default"]=u.a},"79b2":function(n,t,e){"use strict";e.r(t);var a=e("870a"),u=e("6595");for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e("3058");var o=e("f0c5"),r=Object(o["a"])(u["default"],a["b"],a["c"],!1,null,"427aa69b",null,!1,a["a"],void 0);t["default"]=r.exports},"870a":function(n,t,e){"use strict";e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){}));var a=function(){var n=this.$createElement;this._self._c},u=[]},"881b":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={components:{},data:function(){return{}},onLoad:function(n){},methods:{}}},e65b:function(n,t,e){}},[["27fa","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/my/test/index"],{1842:function(n,t,e){"use strict";e.r(t);var a=e("6b27"),u=e.n(a);for(var c in a)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return a[n]}))}(c);t["default"]=u.a},5094:function(n,t,e){"use strict";(function(n,t){var a=e("4ea4");e("f331");a(e("66fd"));var u=a(e("57ae"));n.__webpack_require_UNI_MP_PLUGIN__=e,t(u.default)}).call(this,e("bc2e")["default"],e("543d")["createPage"])},"57ae":function(n,t,e){"use strict";e.r(t);var a=e("bca8"),u=e("1842");for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e("5eb2");var o=e("f0c5"),r=Object(o["a"])(u["default"],a["b"],a["c"],!1,null,"427aa69b",null,!1,a["a"],void 0);t["default"]=r.exports},"5eb2":function(n,t,e){"use strict";var a=e("a423"),u=e.n(a);u.a},"6b27":function(n,t,e){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;t.default={components:{},data:function(){return{}},onLoad:function(n){},methods:{}}},a423:function(n,t,e){},bca8:function(n,t,e){"use strict";e.d(t,"b",(function(){return a})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){}));var a=function(){var n=this.$createElement;this._self._c},u=[]}},[["5094","common/runtime","common/vendor"]]]);

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


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


+ 2 - 1
unpackage/dist/build/mp-weixin/pages/my/userInfo/index.json

xqd
@@ -4,6 +4,7 @@
   "usingComponents": {
     "u-button": "/uni_modules/uview-ui/components/u-button/u-button",
     "u-action-sheet": "/uni_modules/uview-ui/components/u-action-sheet/u-action-sheet",
-    "u-datetime-picker": "/uni_modules/uview-ui/components/u-datetime-picker/u-datetime-picker"
+    "u-datetime-picker": "/uni_modules/uview-ui/components/u-datetime-picker/u-datetime-picker",
+    "privacy-popup": "/components/privacyPopup/index"
   }
 }

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


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/my/userInfo/index.wxss

xqd
@@ -1 +1 @@
-.data-v-39537691 .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-39537691 .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.content.data-v-39537691{background:#f1f1f1;min-height:calc(100vh - 200rpx);padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-39537691{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-39537691:last-child{border-bottom:none}.content .item .line.data-v-39537691{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-39537691{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.content .item .line .right.data-v-39537691{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;display:flex;align-items:center}.content .item .line .right .avatar.data-v-39537691{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-39537691{width:14rpx;height:24rpx}
+.data-v-3577dd2e .u-loading-page{position:relative!important;z-index:999999999!important}.data-v-3577dd2e .u-loading-page__warpper__loading-icon__img{width:150rpx!important;height:150rpx!important}.content.data-v-3577dd2e{background:#f1f1f1;min-height:calc(100vh - 200rpx);padding:0 32rpx;padding-top:24rpx;padding-bottom:24rpx}.content .item.data-v-3577dd2e{background:#fff;border-radius:0rpx 24rpx 0rpx 24rpx;padding:0 24rpx;display:flex;flex-direction:column;margin-bottom:24rpx}.content .item .line.data-v-3577dd2e:last-child{border-bottom:none}.content .item .line.data-v-3577dd2e{display:flex;justify-content:space-between;align-items:center;border-bottom:2rpx solid #e6e6e6;height:140rpx}.content .item .line .left.data-v-3577dd2e{font-size:32rpx;font-family:PingFang-SC-Bold,PingFang-SC;font-weight:700;color:#333}.content .item .line .right.data-v-3577dd2e{font-size:32rpx;font-family:PingFang-SC-Medium,PingFang-SC;font-weight:500;color:#333;display:flex;align-items:center}.content .item .line .right .avatar.data-v-3577dd2e{width:100rpx;height:100rpx;border-radius:50%;margin-right:20rpx}.content .item .line .right .arr.data-v-3577dd2e{width:14rpx;height:24rpx}

+ 1 - 1
unpackage/dist/build/mp-weixin/pages/privicyPopup/index.js

xqd
@@ -1 +1 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/privicyPopup/index"],{"2a1c":function(n,e,t){"use strict";var o=t("6f27"),c=t.n(o);c.a},"47b5":function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){}));var o=function(){var n=this.$createElement;this._self._c},c=[]},"6f27":function(n,e,t){},ae0a:function(n,e,t){"use strict";t.r(e);var o=t("d1f5"),c=t.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);e["default"]=c.a},d165:function(n,e,t){"use strict";(function(n,e){var o=t("4ea4");t("d716");o(t("66fd"));var c=o(t("d1c3"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(c.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},d1c3:function(n,e,t){"use strict";t.r(e);var o=t("47b5"),c=t("ae0a");for(var i in c)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(i);t("2a1c");var a=t("f0c5"),u=Object(a["a"])(c["default"],o["b"],o["c"],!1,null,"86b4cb10",null,!1,o["a"],void 0);e["default"]=u.exports},d1f5:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={components:{PrivacyPopup:function(){t.e("components/privacyPopup/index").then(function(){return resolve(t("7c5e"))}.bind(null,t)).catch(t.oe)}},data:function(){return{showPrivacy:getApp().globalData.showPrivacy}},onLoad:function(n){},methods:{confirm:function(){this.showPrivacy=!1},getPrivacy:function(){getApp().globalData.showPrivacy&&this.$refs.privacyPopup.$refs.popup.open()},onGetPhoneNumber:function(e){"getPhoneNumber:fail:user deny"==e.detail.errMsg?n.showToast({icon:"none",title:"用户拒绝"}):e.detail.code&&this.loginWeiXin(e.detail.code)}}};e.default=o}).call(this,t("543d")["default"])}},[["d165","common/runtime","common/vendor"]]]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pages/privicyPopup/index"],{"0b85":function(n,e,t){"use strict";t.r(e);var o=t("7872"),c=t("123c");for(var i in c)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return c[n]}))}(i);t("217b");var a=t("f0c5"),u=Object(a["a"])(c["default"],o["b"],o["c"],!1,null,"86b4cb10",null,!1,o["a"],void 0);e["default"]=u.exports},"123c":function(n,e,t){"use strict";t.r(e);var o=t("b0d6"),c=t.n(o);for(var i in o)["default"].indexOf(i)<0&&function(n){t.d(e,n,(function(){return o[n]}))}(i);e["default"]=c.a},"217b":function(n,e,t){"use strict";var o=t("c18e"),c=t.n(o);c.a},"2cfe":function(n,e,t){"use strict";(function(n,e){var o=t("4ea4");t("f331");o(t("66fd"));var c=o(t("0b85"));n.__webpack_require_UNI_MP_PLUGIN__=t,e(c.default)}).call(this,t("bc2e")["default"],t("543d")["createPage"])},7872:function(n,e,t){"use strict";t.d(e,"b",(function(){return o})),t.d(e,"c",(function(){return c})),t.d(e,"a",(function(){}));var o=function(){var n=this.$createElement;this._self._c},c=[]},b0d6:function(n,e,t){"use strict";(function(n){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={components:{PrivacyPopup:function(){t.e("components/privacyPopup/index").then(function(){return resolve(t("66d8"))}.bind(null,t)).catch(t.oe)}},data:function(){return{showPrivacy:getApp().globalData.showPrivacy}},onLoad:function(n){},methods:{confirm:function(){this.showPrivacy=!1},getPrivacy:function(){getApp().globalData.showPrivacy&&this.$refs.privacyPopup.$refs.popup.open()},onGetPhoneNumber:function(e){"getPhoneNumber:fail:user deny"==e.detail.errMsg?n.showToast({icon:"none",title:"用户拒绝"}):e.detail.code&&this.loginWeiXin(e.detail.code)}}};e.default=o}).call(this,t("543d")["default"])},c18e:function(n,e,t){}},[["2cfe","common/runtime","common/vendor"]]]);

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


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


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


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


+ 2 - 2
unpackage/dist/build/mp-weixin/project.config.json

xqd
@@ -19,8 +19,8 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.1.0",
-  "appid": "wx98ab2939999e13de",
+  "libVersion": "3.1.5",
+  "appid": "wx03acaa2776bdaceb",
   "projectname": "jiancaiPro",
   "condition": {},
   "editorSetting": {

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


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


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


+ 2 - 2
unpackage/dist/build/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js

xqd
@@ -1,9 +1,9 @@
-(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uni_modules/uni-icons/components/uni-icons/uni-icons"],{2384:function(n,t,e){"use strict";var i=e("aa8b"),u=e.n(i);u.a},3773:function(n,t,e){"use strict";e.r(t);var i=e("434a"),u=e("8294");for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e("2384");var o=e("f0c5"),r=Object(o["a"])(u["default"],i["b"],i["c"],!1,null,null,null,!1,i["a"],void 0);t["default"]=r.exports},"434a":function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){}));var i=function(){var n=this.$createElement;this._self._c},u=[]},"791b":function(n,t,e){"use strict";var i=e("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u=i(e("3263")),c={name:"UniIcons",emits:["click"],props:{type:{type:String,default:""},color:{type:String,default:"#333333"},size:{type:[Number,String],default:16},customPrefix:{type:String,default:""}},data:function(){return{icons:u.default.glyphs}},computed:{unicode:function(){var n=this,t=this.icons.find((function(t){return t.font_class===n.type}));return t?unescape("%u".concat(t.unicode)):""},iconSize:function(){return function(n){return"number"===typeof n||/^[0-9]*$/g.test(n)?n+"px":n}(this.size)}},methods:{_onClick:function(){this.$emit("click")}}};t.default=c},8294:function(n,t,e){"use strict";e.r(t);var i=e("791b"),u=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(c);t["default"]=u.a},aa8b:function(n,t,e){}}]);
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["uni_modules/uni-icons/components/uni-icons/uni-icons"],{"1d0d":function(n,t,e){"use strict";e.r(t);var i=e("f3da"),u=e.n(i);for(var c in i)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return i[n]}))}(c);t["default"]=u.a},"2cf0":function(n,t,e){"use strict";e.r(t);var i=e("4c74"),u=e("1d0d");for(var c in u)["default"].indexOf(c)<0&&function(n){e.d(t,n,(function(){return u[n]}))}(c);e("b4e4");var o=e("f0c5"),r=Object(o["a"])(u["default"],i["b"],i["c"],!1,null,null,null,!1,i["a"],void 0);t["default"]=r.exports},"4c74":function(n,t,e){"use strict";e.d(t,"b",(function(){return i})),e.d(t,"c",(function(){return u})),e.d(t,"a",(function(){}));var i=function(){var n=this.$createElement;this._self._c},u=[]},b4e4:function(n,t,e){"use strict";var i=e("e44c"),u=e.n(i);u.a},e44c:function(n,t,e){},f3da:function(n,t,e){"use strict";var i=e("4ea4");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var u=i(e("04a9")),c={name:"UniIcons",emits:["click"],props:{type:{type:String,default:""},color:{type:String,default:"#333333"},size:{type:[Number,String],default:16},customPrefix:{type:String,default:""}},data:function(){return{icons:u.default.glyphs}},computed:{unicode:function(){var n=this,t=this.icons.find((function(t){return t.font_class===n.type}));return t?unescape("%u".concat(t.unicode)):""},iconSize:function(){return function(n){return"number"===typeof n||/^[0-9]*$/g.test(n)?n+"px":n}(this.size)}},methods:{_onClick:function(){this.$emit("click")}}};t.default=c}}]);
 ;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
     'uni_modules/uni-icons/components/uni-icons/uni-icons-create-component',
     {
         'uni_modules/uni-icons/components/uni-icons/uni-icons-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('543d')['createComponent'](__webpack_require__("3773"))
+            __webpack_require__('543d')['createComponent'](__webpack_require__("2cf0"))
         })
     },
     [['uni_modules/uni-icons/components/uni-icons/uni-icons-create-component']]

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