完善至隐私协议

App.vue

@@ -1,16 +1,29 @@
 <script>
 	export default {
-		onLaunch: function() {
-			console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
-			console.log('App Launch')
-
-			// uni.hideTabBar()
+		globalData: {
+			showPrivacy: false
+		},
+		onLaunch: function(options) {
+			if (uni.getPrivacySetting) {
+				uni.getPrivacySetting({
+					success: res => {
+						console.log("是否需要授权：", res.needAuthorization, "隐私协议的名称为：", res.privacyContractName)
+						if (res.needAuthorization) {
+							getApp().globalData.showPrivacy = true;
+						} else {
+							getApp().globalData.showPrivacy = false;
+						}
+					},
+					fail: () => {},
+					complete: () => {},
+				})
+			}
 		},
 		onShow: function() {
-			console.log('App Show')
+			// console.log('App Show')
 		},
 		onHide: function() {
-			console.log('App Hide')
+			// console.log('App Hide')
 		}
 	}
 </script>

api/test/index.js

@@ -0,0 +1,138 @@
+//我的相关:
+const {
+	http
+} = uni.$u
+
+
+//用户相关
+// 微信授权登陆
+export const wxAuthLoginReq = (params, config = {}) => http.post('/api/auth/mnplogin', params, config)
+
+// 获取用户信息
+export const getUserInfoReq = (params, config = {}) => http.get('/api/users/getUserInfo', params, config)
+
+
+// 更新用户信息
+export const updateUserInfoReq = (params, config = {}) => http.post('/api/users/updateUserInfo', params, config)
+
+
+
+
+// 首页相关
+// 获取首页配置
+export const getIndexConfigReq = (params, config = {}) => http.get('/api/getHomeData', params, config)
+
+
+
+// 订单相关相关
+// 提交订单
+export const postOrderReq = (params, config = {}) => http.post('/api/order/submitOrder', params, config)
+
+// 获取订单详细
+export const getOrderDetailReq = (params, config = {}) => {
+	let apiUrl = '/api/order/getOrderDetail'
+	Object.keys(params).forEach((item, index) => {
+		if (index == 0) {
+			apiUrl += `?${item}=${params[item]}`
+		} else {
+			apiUrl += `&${item}=${params[item]}`
+		}
+	})
+	console.log('处理后的apiUrl', apiUrl);
+
+	return http.get(apiUrl, params, config)
+}
+
+
+// 获取商城分类数据
+export const getMallCatReq = (params, config = {}) => http.get('/api/goods/getClassifyData', params, config)
+
+
+// 获取商城数据
+export const getMallReq = (params, config = {}) => {
+	let apiUrl = '/api/goods/getGoodsData'
+	Object.keys(params).forEach((item, index) => {
+		if (index == 0) {
+			apiUrl += `?${item}=${params[item]}`
+		} else {
+			apiUrl += `&${item}=${params[item]}`
+		}
+	})
+	console.log('处理后的apiUrl', apiUrl);
+	return http.get(apiUrl, params, config)
+}
+
+
+// 获取商城分类数据
+export const getSerDocReq = (params, config = {}) => http.get('/api/server/getServerData', params, config)
+
+
+
+// 获取各个身份的价格百分比
+export const getPricePercentReq = (params, config = {}) => http.get('/api/common/getPriceConfig', params, config)
+
+
+// 获取我的售后保障
+export const getSerBackReq = (params, config = {}) => http.get('/api/users/getMyAfterSaleData', params, config)
+
+
+
+// 获取我的服务流程
+export const getSerStepReq = (params, config = {}) => http.get('/api/users/getMyServiceProcess', params, config)
+
+// 获取我的售后商品
+export const getSerBackGoodsReq = (params, config = {}) => {
+
+	let apiUrl = '/api/users/getMyAfterSaleGoods'
+	Object.keys(params).forEach((item, index) => {
+		if (index == 0) {
+			apiUrl += `?${item}=${params[item]}`
+		} else {
+			apiUrl += `&${item}=${params[item]}`
+		}
+	})
+	console.log('处理后的apiUrl', apiUrl);
+	return http.get(apiUrl, params, config)
+}
+
+
+
+//获取我的售后联系
+export const getSerBackConReq = (params, config = {}) => http.get('/api/users/getMyAfterSaleContact', params, config)
+
+
+
+// 提交邀请
+export const postInviteReq = (params, config = {}) => http.post('/api/invite/submitInviteData', params, config)
+
+
+//获取我的邀请
+export const getMyInviteReq = (params, config = {}) => {
+
+	let apiUrl = '/api/invite/getMyInviteData'
+	Object.keys(params).forEach((item, index) => {
+		if (index == 0) {
+			apiUrl += `?${item}=${params[item]}`
+		} else {
+			apiUrl += `&${item}=${params[item]}`
+		}
+	})
+	console.log('处理后的apiUrl', apiUrl);
+	return http.get(apiUrl, params, config)
+}
+
+
+// 添加邀请
+export const addInviteReq = (params, config = {}) => http.post('/api/invite/addInvite', params, config)
+
+// 添加收藏
+export const addCollReq = (params, config = {}) => http.post('/api/users/addCollect', params, config)
+
+
+// 取消收藏
+export const cancelCollReq = (params, config = {}) => http.post('/api/users/cancelCollect', params, config)
+
+
+
+//获取活动商品
+export const getActGoodsReq = (params, config = {}) => http.get('/api/getActivityData', params, config)

common/config.js

@@ -1,7 +1,7 @@
 let configUrl = {}
 if (process.env.NODE_ENV === 'development') {
 	configUrl = {
-		baseUrl: 'http://t16.9026.com/api/api/v1/common/uploadFile',
+		baseUrl: 'http://t23.9026.com/index.php/api/upload',
 	}
 } else {
 	configUrl = {

components/privacyPopup/index.scss

@@ -0,0 +1,55 @@
+.popup-box {
+		width: 80vw;
+		// height: 40vh;
+		overflow: hidden;
+		background: #ffffff;
+		padding: 30rpx;
+		border-radius: 24rpx;
+
+		.weui-half-screen-dialog__hd {
+			font-size: 48rpx;
+			font-family: Source Han Sans CN-Bold, Source Han Sans CN;
+			font-weight: bold;
+			color: #000000;
+			line-height: 56rpx;
+		}
+
+		.weui-half-screen-dialog__bd {
+			margin-top: 48rpx;
+			text-indent: 2em;
+			.weui-half-screen-dialog__tips {
+				font-size: 28rpx;
+				font-family: Source Han Sans CN-Normal, Source Han Sans CN;
+				font-weight: 400;
+				color: #000000;
+				line-height: 33rpx;
+			}
+		}
+
+		.weui-half-screen-dialog__ft {
+			display: flex;
+			justify-content: space-evenly;
+			align-items: center;
+			margin-top: 48rpx;
+			.weui-btn {
+				padding: 0 60rpx;
+				margin: 0;
+				background: none;
+				font-size: 32rpx;
+				font-family: Source Han Sans CN-Normal, Source Han Sans CN;
+				font-weight: 400;
+				color: #000000;
+				line-height: 80rpx;
+				// border: 2rpx solid #8BC21F;
+			}
+
+			.agree {
+				color: #ffffff;
+				background: linear-gradient(90deg, #8BC21F 0%, #7AB30A 100%);
+			}
+		}
+
+		.color-8BC21F {
+			color: #8BC21F !important;
+		}
+	}

components/privacyPopup/index.vue

@@ -0,0 +1,51 @@
+<template>
+	<uni-popup ref="popup" type="center" :is-mask-click="false">
+		<view class="popup-box">
+			<view class="weui-half-screen-dialog__hd">
+				{{title}}
+			</view>
+			<view class="weui-half-screen-dialog__bd">
+				<text class="weui-half-screen-dialog__tips">{{desc1}}</text>
+				<text class="weui-half-screen-dialog__tips color-8BC21F" @click="openPrivacyContract">
+					{{urlTitle}}
+				</text>
+				<text class="weui-half-screen-dialog__tips">{{desc2}}</text>
+			</view>
+			<view class="weui-half-screen-dialog__ft">
+				<button class="weui-btn" @click="handleDisagree">拒绝</button>
+				<button id="agree-btn" type="default" open-type="agreePrivacyAuthorization" class="weui-btn agree"
+					@agreeprivacyauthorization="handleAgreePrivacyAuthorization">同意</button>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: "用户隐私保护提示",
+				desc1: "感谢您使用本产品，您使用本产品前应当仔细阅读并同意",
+				urlTitle: "《小程序隐私保护指引》",
+				desc2: "当您点击同意并开始使用产品服务时，即表示你已理解并同意该条款内容，该条款将对您产生法律约束力。如您拒绝，将无法更好的体验产品。",
+			};
+		},
+		methods: {
+			openPrivacyContract() {
+				uni.openPrivacyContract({});
+			},
+			handleAgreePrivacyAuthorization() {
+				getApp().globalData.showPrivacy = false;
+				this.$emit('confirm');
+				this.$refs.popup.close();
+			},
+			handleDisagree() {
+				this.$refs.popup.close();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

manifest.json

@@ -1,65 +1,66 @@
 {
-    "name" : "jiancaiPro",
-    "appid" : "__UNI__C046D51",
-    "description" : "",
-    "versionName" : "1.0.0",
-    "versionCode" : "100",
-    "transformPx" : false,
-    "app-plus" : {
-        /* 5+App特有相关 */
-        "usingComponents" : true,
-        "nvueCompiler" : "uni-app",
-        "nvueStyleCompiler" : "uni-app",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : true,
-            "waiting" : true,
-            "autoclose" : true,
-            "delay" : 0
-        },
-        "modules" : {},
-        /* 模块配置 */
-        "distribute" : {
-            /* 应用发布信息 */
-            "android" : {
-                /* android打包配置 */
-                "permissions" : [
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
-            },
-            "ios" : {},
-            /* ios打包配置 */
-            "sdkConfigs" : {}
-        }
-    },
-    /* SDK配置 */
-    "quickapp" : {},
-    /* 快应用特有相关 */
-    "mp-weixin" : {
-        "appid" : "wx98ab2939999e13de",
-        "setting" : {
-            "urlCheck" : false
-        },
-        "usingComponents" : true,
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "用于小程序使用中为您提供位置信息"
-            }
-        },
-        "requiredPrivateInfos" : [ "getLocation", "choosePoi", "chooseAddress", "chooseLocation" ]
-    },
-    "vueVersion" : "2"
-}
+	"name": "jiancaiPro",
+	"appid": "__UNI__C046D51",
+	"description": "",
+	"versionName": "1.0.0",
+	"versionCode": "100",
+	"transformPx": false,
+	"app-plus": {
+		/* 5+App特有相关 */
+		"usingComponents": true,
+		"nvueCompiler": "uni-app",
+		"nvueStyleCompiler": "uni-app",
+		"splashscreen": {
+			"alwaysShowBeforeRender": true,
+			"waiting": true,
+			"autoclose": true,
+			"delay": 0
+		},
+		"modules": {},
+		/* 模块配置 */
+		"distribute": {
+			/* 应用发布信息 */
+			"android": {
+				/* android打包配置 */
+				"permissions": [
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-feature android:name=\"android.hardware.camera\"/>",
+					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+				]
+			},
+			"ios": {},
+			/* ios打包配置 */
+			"sdkConfigs": {}
+		}
+	},
+	/* SDK配置 */
+	"quickapp": {},
+	/* 快应用特有相关 */
+	"mp-weixin": {
+		"appid": "wx98ab2939999e13de",
+		"setting": {
+			"urlCheck": false
+		},
+		"usingComponents": true,
+		"permission": {
+			"scope.userLocation": {
+				"desc": "用于小程序使用中为您提供位置信息"
+			}
+		},
+		"requiredPrivateInfos": ["getLocation", "choosePoi", "chooseAddress", "chooseLocation"]
+		// "__usePrivacyCheck__": true
+	},
+	"vueVersion": "2"
+}

pages.json

@@ -41,6 +41,18 @@
 			"style": {
 				"navigationBarTitleText": "二维码页面"
 			}
+		},
+		{
+			"path": "pages/test/index",
+			"style": {
+				"navigationBarTitleText": "接口测试页面"
+			}
+		},
+		{
+			"path": "pages/privicyPopup/index",
+			"style": {
+				"navigationBarTitleText": "隐私弹窗页面"
+			}
 		}
 	],
 	"globalStyle": {

pages/my/index.vue

@@ -24,6 +24,7 @@
 
 		<button open-type="getPhoneNumber" @getphonenumber="getphonenumber">获取用户手机号</button>
 		<button @click="get_user">获取用户头像昵称等信息</button>
+		<button @click="testPrcBox">测试隐私弹框</button>
 
 		<view class="">
 			头像
@@ -32,6 +33,13 @@
 		<view class="">
 			昵称：{{user_name}}
 		</view>
+
+
+		<view v-if="showPrivacy">
+			<view>隐私弹窗内容....</view>
+			<button id="agree-btn" open-type="agreePrivacyAuthorization"
+				@click="handleAgreePrivacyAuthorization">同意</button>
+		</view>
 	</view>
 </template>
 
@@ -44,6 +52,8 @@
 		// },
 		data() {
 			return {
+				showPrivacy: true,
+
 				avatarUrl: '',
 				nickName: '',
 				PhoneCode: '',
@@ -54,7 +64,38 @@
 				user_name: ''
 			}
 		},
+		onLoad() {
+			wx.onNeedPrivacyAuthorization((resolve, eventInfo) => {
+				console.log('触发本次事件的接口是：' + eventInfo.referrer)
+				// 需要用户同意隐私授权时
+				// 弹出开发者自定义的隐私授权弹窗
+				this.showPrivacy = true
+
+				this.resolvePrivacyAuthorization = resolve
+			})
+
+			// wx.getUserProfile({
+			// 	success: console.log,
+			// 	fail: console.error
+			// })
+		},
 		methods: {
+			handleAgreePrivacyAuthorization() {
+				// 用户点击同意按钮后
+				this.resolvePrivacyAuthorization({
+					buttonId: 'agree-btn',
+					event: 'agree'
+				})
+				// 用户点击同意后，开发者调用 resolve({ buttonId: 'agree-btn', event: 'agree' })  告知平台用户已经同意，参数传同意按钮的id。为确保用户有同意的操作，基础库在 resolve 被调用后，会去检查对应的同意按钮有没有被点击过。检查通过后，相关隐私接口会继续调用
+				// 用户点击拒绝后，开发者调用 resolve({ event:'disagree' }) 告知平台用户已经拒绝
+			},
+
+			testPrcBox() {
+				// wx.onNeedPrivacyAuthorization(function callback)
+				uni.navigateTo({
+					url: '/pages/privicyPopup/index'
+				})
+			},
 			genQr() {
 				uni.navigateTo({
 					url: '/pages/qrPage/index'
@@ -101,15 +142,16 @@
 					},
 					formData: {
 						'fileType': 'images',
-						'dirName': 'cert'
+						'dirName': 'cert',
+						'tag': 'lamp'
 					},
 					success: function(uploadRes) {
 						let result = JSON.parse(uploadRes.data)
 						// localStorage.set('imgUrl', result.data.fileUrl)
 						if (result.code == 0) {
-							_this.avatarUrl = result.data.url
+							_this.avatarUrl = result.data.file
 							// _this.user_img = result.data.url
-							console.log('上传后的头像url地址', result.data.url)
+							console.log('上传后的头像url地址', result.data.file)
 						}
 					},
 					fail: function(err) {
@@ -130,7 +172,7 @@
 						console.log('uni.login返回值：', res)
 						if (res.errMsg == 'login:ok') {
 							// 获取密钥 === 需要登录才可以获取密钥
-							// return
+							return
 							uni.request({
 								url: 'https://api.weixin.qq.com/sns/jscode2session', // 请求微信服务器
 								method: 'GET',

pages/privicyPopup/index.scss

@@ -0,0 +1,3 @@
+.page{
+	
+}

pages/privicyPopup/index.vue

@@ -0,0 +1,55 @@
+<template>
+	<view class="page">
+		<navBar title="隐私弹窗" :back="true" color="white" background="green" />
+
+		<button v-if="showPrivacy" class="btn" @click="getPrivacy">获取头像</button>
+		<!-- <button v-else class="btn" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber">手机号快捷登录</button> -->
+		<button v-else class="btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+			获取头像
+		</button>
+		<privacy-popup ref="privacyPopup" @confirm="confirm"></privacy-popup>
+	</view>
+</template>
+
+<script>
+	import PrivacyPopup from "@/components/privacyPopup/index.vue";
+
+	export default {
+		components: {
+			PrivacyPopup
+		},
+		data() {
+			return {
+				showPrivacy: getApp().globalData.showPrivacy,
+			}
+		},
+		onLoad(options) {},
+		methods: {
+			confirm() {
+				this.showPrivacy = false;
+			},
+			getPrivacy() {
+				if (getApp().globalData.showPrivacy) {
+					this.$refs.privacyPopup.$refs.popup.open();
+					return;
+				}
+			},
+			// 获取手机号
+			onGetPhoneNumber(e) {
+				// 用户拒绝授权
+				if (e.detail.errMsg == "getPhoneNumber:fail:user deny") {
+					uni.showToast({
+						icon: 'none',
+						title: '用户拒绝'
+					});
+				} else if (e.detail.code) { // 允许授权
+					this.loginWeiXin(e.detail.code);
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/qrPage/index.vue

@@ -162,9 +162,10 @@
 					url: `https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=${access_token}`,
 					responseType: 'arraybuffer',
 					data: JSON.stringify({
-						scene: 'kcardCode=123456',
+						// scene: 'kcardCode=123456',
 						// page: 'pages/qrPage/index',
-						page: 'pages/index/index',
+						scene: 'a=1-b=2-c=李万涛',
+						page: 'pages/my/index',
 						check_path: false
 					}),
 					header: {

pages/test/index.vue

@@ -1,12 +1,55 @@
 <template>
 	<view class="container">
-		<navBar title="售后" :back="false" color="white" background="green" />
+		<navBar title="接口测试" :back="true" color="white" background="green" />
+		<button @click="wxAuthLogin">微信授权登陆</button>
+		<button @click="getUserInfo">获取用户信息</button>
+		<button @click="updatetUserInfo">更新用户信息</button>
+		<button @click="updatetUserInfo">更新用户信息</button>
+		<button @click="getIndexConfig">获取首页配置</button>
+		<button @click="postOrder">提交订单</button>
+		<button @click="getOrderDetail">获取订单详细</button>
+		<button @click="getMallCat">获取商城分类数据</button>
+		<button @click="getMall">获取商城数据</button>
+		<button @click="getSerDoc">获取服务文档数据</button>
+		<button @click="getPricePercent">获取各个身份的价格百分比</button>
+		<button @click="getSerBack">获取我的售后保障</button>
+		<button @click="getSerStep">获取我的服务流程</button>
+		<button @click="getSerBackGoods">获取我的售后商品</button>
+		<button @click="getSerBackCon">获取我的售后联系</button>
+		<button @click="postInvite">提交邀请</button>
+		<button @click="getMyInvite">获取我的邀请</button>
+		<button @click="addInvite">添加邀请</button>
+		<button @click="addColl">添加收藏</button>
+		<button @click="cancelColl">取消收藏</button>
+		<button @click="getActGoods">获取活动商品</button>
+
 
 	</view>
 </template>
 
 <script>
-	// import navBar from '@/components/navBar/index.vue'
+	import {
+		wxAuthLoginReq,
+		getUserInfoReq,
+		updateUserInfoReq,
+		getIndexConfigReq,
+		postOrderReq,
+		getOrderDetailReq,
+		getMallCatReq,
+		getMallReq,
+		getSerDocReq,
+		getPricePercentReq,
+		getSerBackReq,
+		getSerStepReq,
+		getSerBackGoodsReq,
+		getSerBackConReq,
+		postInviteReq,
+		getMyInviteReq,
+		addInviteReq,
+		addCollReq,
+		cancelCollReq,
+		getActGoodsReq
+	} from '@/api/test/index.js'
 	export default {
 		// components: {
 		// 	navBar
@@ -17,7 +60,275 @@
 			}
 		},
 		methods: {
+			async wxAuthLogin() {
+				let res = await wxAuthLoginReq({
+					code: '0b3nl20w3x5lh13zH53w3HRKX02nl20H'
+				})
+				if (res.code == 0) {
+					console.log('微信授权登陆返回值:', res);
+
+					uni.setStorageSync('token', res.data.token)
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+
+			async getUserInfo() {
+				let res = await getUserInfoReq()
+				if (res.code == 0) {
+					console.log('获取用户信息返回值:', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
 
+			async updatetUserInfo() {
+				let res = await updateUserInfoReq({
+					nickname: '测试昵称',
+					head: 'https://himg.bdimg.com/sys/portraitn/item/public.1.7bbfbe74.qTDof1r_zukwKzMF2A-cRQ',
+					phone: '15609038521',
+					sex: 1,
+					name: '李万涛',
+					birthday: '1999-01-03'
+				})
+				if (res.code == 0) {
+					console.log('更新用户信息返回值:', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getIndexConfig() {
+				let res = await getIndexConfigReq({
+					type: 2
+				})
+				if (res.code == 0) {
+					console.log('获取首页配置返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async postOrder() {
+				let res = await postOrderReq({
+					address: '成都市金牛区长平街70号',
+					phone: '15609038521',
+					name: '李万涛',
+					remark: '备注内容',
+					config_id: '1,3,5',
+					lamp_id: '2,4,6'
+				})
+				if (res.code == 0) {
+					console.log('提交订单返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+
+			async getOrderDetail() {
+				let res = await getOrderDetailReq({
+					orderId: '3bfc962f6f049082267020faf903d777',
+				})
+				if (res.code == 0) {
+					console.log('获取订单详细返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getMallCat() {
+				let res = await getMallCatReq()
+				if (res.code == 0) {
+					console.log('获取商城分类数据返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getMall() {
+				let res = await getMallReq({
+					page: 1,
+					type: 1,
+					brand: 0,
+					search: '筒'
+				})
+				if (res.code == 0) {
+					console.log('获取商城数据返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getSerDoc() {
+				let res = await getSerDocReq()
+				if (res.code == 0) {
+					console.log('获取服务文档数据返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getPricePercent() {
+				let res = await getPricePercentReq()
+				if (res.code == 0) {
+					console.log('获取各个身份的价格百分比返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getSerBack() {
+				let res = await getSerBackReq()
+				if (res.code == 0) {
+					console.log('获取我的售后保障返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getSerStep() {
+				let res = await getSerStepReq()
+				if (res.code == 0) {
+					console.log('获取我的服务流程返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getSerBackGoods() {
+				let res = await getSerBackGoodsReq({
+					page: 1
+				})
+				if (res.code == 0) {
+					console.log('获取我的售后商品返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getSerBackCon() {
+				let res = await getSerBackConReq()
+				if (res.code == 0) {
+					console.log('获取我的售后联系返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async postInvite() {
+				let res = await postInviteReq({
+					type: 0,
+					name: '李万涛',
+					phone: '15609038521',
+					status: 'G-VIP',
+					company: '思维定制科技有限公司',
+					remark: '我的备注project_nameproject_name',
+					project_name: 'project_name'
+				})
+				if (res.code == 0) {
+					console.log('提交邀请返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getMyInvite() {
+				let res = await getMyInviteReq({
+					type: 0,
+					state: 0,
+				})
+				if (res.code == 0) {
+					console.log('获取我的邀请返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async addInvite() {
+				let res = await addInviteReq({
+					inviteId: 'b3f48188b03b54aeb32256c825044e35',
+				})
+				if (res.code == 0) {
+					console.log('添加邀请返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async addColl() {
+				let res = await addCollReq({
+					id: 2,
+				})
+				if (res.code == 0) {
+					console.log('添加收藏返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async cancelColl() {
+				let res = await cancelCollReq({
+					id: 1,
+				})
+				if (res.code == 0) {
+					console.log('取消收藏返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			},
+			async getActGoods() {
+				let res = await getActGoodsReq()
+				if (res.code == 0) {
+					console.log('获取活动商品返回值: ', res);
+				} else {
+					uni.showToast({
+						title: res.message,
+						icon: 'none'
+					})
+				}
+			}
 		}
 	}
 </script>

unpackage/dist/dev/.sourcemap/mp-weixin/pages/privacy/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["uni-app:///main.js"],"names":["wx","__webpack_require_UNI_MP_PLUGIN__","__webpack_require__","createPage","Page"],"mappings":";;;;;;;;;;;;;AAAA;AAGA;AACA;AAHA;AACAA,EAAE,CAACC,iCAAiC,GAAGC,mBAAmB;AAG1DC,UAAU,CAACC,cAAI,CAAC,C","file":"pages/privacy/index.js","sourcesContent":["import 'uni-pages';\n// @ts-ignore\nwx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;\nimport Vue from 'vue'\nimport Page from './pages/privacy/index.vue'\ncreatePage(Page)"],"sourceRoot":""}

unpackage/dist/dev/mp-weixin/app.json

@@ -5,7 +5,9 @@
     "pages/service/index",
     "pages/my/index",
     "pages/map/index",
-    "pages/qrPage/index"
+    "pages/qrPage/index",
+    "pages/test/index",
+    "pages/privicyPopup/index"
   ],
   "subPackages": [],
   "window": {

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

@@ -23,13 +23,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 wx.__webpack_require_UNI_MP_PLUGIN__ = __webpack_require__;
 var navBar = function navBar() {
   __webpack_require__.e(/*! require.ensure | components/navBar/index */ "components/navBar/index").then((function () {
-    return resolve(__webpack_require__(/*! @/components/navBar/index.vue */ 222));
+    return resolve(__webpack_require__(/*! @/components/navBar/index.vue */ 239));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component('navBar', navBar);
 var popup = function popup() {
   __webpack_require__.e(/*! require.ensure | components/popup/index */ "components/popup/index").then((function () {
-    return resolve(__webpack_require__(/*! @/components/popup/index.vue */ 229));
+    return resolve(__webpack_require__(/*! @/components/popup/index.vue */ 246));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component('dpopup', popup);
@@ -121,28 +121,41 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-
+/* WEBPACK VAR INJECTION */(function(uni) {
 
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _default = {
-  onLaunch: function onLaunch() {
-    console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！');
-    console.log('App Launch');
-
-    // uni.hideTabBar()
+  globalData: {
+    showPrivacy: false
+  },
+  onLaunch: function onLaunch(options) {
+    if (uni.getPrivacySetting) {
+      uni.getPrivacySetting({
+        success: function success(res) {
+          console.log("是否需要授权：", res.needAuthorization, "隐私协议的名称为：", res.privacyContractName);
+          if (res.needAuthorization) {
+            getApp().globalData.showPrivacy = true;
+          } else {
+            getApp().globalData.showPrivacy = false;
+          }
+        },
+        fail: function fail() {},
+        complete: function complete() {}
+      });
+    }
   },
-
   onShow: function onShow() {
-    console.log('App Show');
+    // console.log('App Show')
   },
   onHide: function onHide() {
-    console.log('App Hide');
+    // console.log('App Hide')
   }
 };
 exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

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

@@ -105,11 +105,11 @@
 /******/
 /******/
 /******/ 		// mini-css-extract-plugin CSS loading
-/******/ 		var cssChunks = {"components/navBar/index":1,"components/popup/index":1,"uni_modules/uview-ui/components/u-button/u-button":1,"uni_modules/uview-ui/components/u-sticky/u-sticky":1,"uni_modules/uview-ui/components/u-tabs/u-tabs":1,"components/wike-painter/wike-painter":1,"uni_modules/uview-ui/components/u-popup/u-popup":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":1,"uni_modules/uview-ui/components/u-icon/u-icon":1,"uni_modules/uview-ui/components/u-loading-icon/u-loading-icon":1,"uni_modules/uview-ui/components/u-badge/u-badge":1,"uni_modules/uview-ui/components/u-overlay/u-overlay":1,"uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom":1,"uni_modules/uview-ui/components/u-status-bar/u-status-bar":1,"uni_modules/uview-ui/components/u-transition/u-transition":1};
+/******/ 		var cssChunks = {"components/navBar/index":1,"components/popup/index":1,"uni_modules/uview-ui/components/u-button/u-button":1,"uni_modules/uview-ui/components/u-sticky/u-sticky":1,"uni_modules/uview-ui/components/u-tabs/u-tabs":1,"components/wike-painter/wike-painter":1,"uni_modules/uview-ui/components/u-popup/u-popup":1,"components/privacyPopup/index":1,"uni_modules/uni-icons/components/uni-icons/uni-icons":1,"uni_modules/uview-ui/components/u-icon/u-icon":1,"uni_modules/uview-ui/components/u-loading-icon/u-loading-icon":1,"uni_modules/uview-ui/components/u-badge/u-badge":1,"uni_modules/uview-ui/components/u-overlay/u-overlay":1,"uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom":1,"uni_modules/uview-ui/components/u-status-bar/u-status-bar":1,"uni_modules/uview-ui/components/u-transition/u-transition":1,"uni_modules/uni-popup/components/uni-popup/uni-popup":1};
 /******/ 		if(installedCssChunks[chunkId]) promises.push(installedCssChunks[chunkId]);
 /******/ 		else if(installedCssChunks[chunkId] !== 0 && cssChunks[chunkId]) {
 /******/ 			promises.push(installedCssChunks[chunkId] = new Promise(function(resolve, reject) {
-/******/ 				var href = "" + ({"components/navBar/index":"components/navBar/index","components/popup/index":"components/popup/index","uni_modules/uview-ui/components/u-button/u-button":"uni_modules/uview-ui/components/u-button/u-button","uni_modules/uview-ui/components/u-sticky/u-sticky":"uni_modules/uview-ui/components/u-sticky/u-sticky","uni_modules/uview-ui/components/u-tabs/u-tabs":"uni_modules/uview-ui/components/u-tabs/u-tabs","components/wike-painter/wike-painter":"components/wike-painter/wike-painter","uni_modules/uview-ui/components/u-popup/u-popup":"uni_modules/uview-ui/components/u-popup/u-popup","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons","uni_modules/uview-ui/components/u-icon/u-icon":"uni_modules/uview-ui/components/u-icon/u-icon","uni_modules/uview-ui/components/u-loading-icon/u-loading-icon":"uni_modules/uview-ui/components/u-loading-icon/u-loading-icon","uni_modules/uview-ui/components/u-badge/u-badge":"uni_modules/uview-ui/components/u-badge/u-badge","uni_modules/uview-ui/components/u-overlay/u-overlay":"uni_modules/uview-ui/components/u-overlay/u-overlay","uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom":"uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom","uni_modules/uview-ui/components/u-status-bar/u-status-bar":"uni_modules/uview-ui/components/u-status-bar/u-status-bar","uni_modules/uview-ui/components/u-transition/u-transition":"uni_modules/uview-ui/components/u-transition/u-transition"}[chunkId]||chunkId) + ".wxss";
+/******/ 				var href = "" + ({"components/navBar/index":"components/navBar/index","components/popup/index":"components/popup/index","uni_modules/uview-ui/components/u-button/u-button":"uni_modules/uview-ui/components/u-button/u-button","uni_modules/uview-ui/components/u-sticky/u-sticky":"uni_modules/uview-ui/components/u-sticky/u-sticky","uni_modules/uview-ui/components/u-tabs/u-tabs":"uni_modules/uview-ui/components/u-tabs/u-tabs","components/wike-painter/wike-painter":"components/wike-painter/wike-painter","uni_modules/uview-ui/components/u-popup/u-popup":"uni_modules/uview-ui/components/u-popup/u-popup","components/privacyPopup/index":"components/privacyPopup/index","uni_modules/uni-icons/components/uni-icons/uni-icons":"uni_modules/uni-icons/components/uni-icons/uni-icons","uni_modules/uview-ui/components/u-icon/u-icon":"uni_modules/uview-ui/components/u-icon/u-icon","uni_modules/uview-ui/components/u-loading-icon/u-loading-icon":"uni_modules/uview-ui/components/u-loading-icon/u-loading-icon","uni_modules/uview-ui/components/u-badge/u-badge":"uni_modules/uview-ui/components/u-badge/u-badge","uni_modules/uview-ui/components/u-overlay/u-overlay":"uni_modules/uview-ui/components/u-overlay/u-overlay","uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom":"uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom","uni_modules/uview-ui/components/u-status-bar/u-status-bar":"uni_modules/uview-ui/components/u-status-bar/u-status-bar","uni_modules/uview-ui/components/u-transition/u-transition":"uni_modules/uview-ui/components/u-transition/u-transition","uni_modules/uni-popup/components/uni-popup/uni-popup":"uni_modules/uni-popup/components/uni-popup/uni-popup","uni_modules/uni-transition/components/uni-transition/uni-transition":"uni_modules/uni-transition/components/uni-transition/uni-transition"}[chunkId]||chunkId) + ".wxss";
 /******/ 				var fullhref = __webpack_require__.p + href;
 /******/ 				var existingLinkTags = document.getElementsByTagName("link");
 /******/ 				for(var i = 0; i < existingLinkTags.length; i++) {

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

@@ -20829,7 +20829,7 @@ exports.getValidateCode = getValidateCode;
 
 /* WEBPACK VAR INJECTION */(function(uni) {uni.$u.http.setConfig(function (config) {
   if (true) {
-    config.baseURL = 'http://t16.9026.com/';
+    config.baseURL = 'http://t23.9026.com/index.php';
   } else {}
   config.header = {
     // 'Content-Type': 'application/x-www-form-urlencoded',
@@ -20866,9 +20866,9 @@ module.exports = function (vm) {
   uni.$u.http.interceptors.request.use(function (config) {
     // 可使用async await 做异步操作
     config.data = config.data || {};
-    if ((0, _auth.getToken)()) {
+    if (uni.getStorageSync('token')) {
       // config.header['Authorization'] = getToken()
-      config.header['Authorization'] = (0, _auth.getToken)();
+      config.header['Authorization'] = uni.getStorageSync('token');
     }
     return config;
   }, function (config) {
@@ -22316,7 +22316,7 @@ exports.default = _default;
 var configUrl = {};
 if (true) {
   configUrl = {
-    baseUrl: 'http://t16.9026.com/api/api/v1/common/uploadFile'
+    baseUrl: 'http://t23.9026.com/index.php/api/upload'
   };
 } else {}
 module.exports = configUrl;
@@ -23290,7 +23290,204 @@ module.exports = {
 /* 225 */,
 /* 226 */,
 /* 227 */,
-/* 228 */,
+/* 228 */
+/*!***********************************************!*\
+  !*** D:/desktop/jiancaiPro/api/test/index.js ***!
+  \***********************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.wxAuthLoginReq = exports.updateUserInfoReq = exports.postOrderReq = exports.postInviteReq = exports.getUserInfoReq = exports.getSerStepReq = exports.getSerDocReq = exports.getSerBackReq = exports.getSerBackGoodsReq = exports.getSerBackConReq = exports.getPricePercentReq = exports.getOrderDetailReq = exports.getMyInviteReq = exports.getMallReq = exports.getMallCatReq = exports.getIndexConfigReq = exports.getActGoodsReq = exports.cancelCollReq = exports.addInviteReq = exports.addCollReq = void 0;
+//我的相关:
+var http = uni.$u.http;
+
+//用户相关
+// 微信授权登陆
+var wxAuthLoginReq = function wxAuthLoginReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.post('/api/auth/mnplogin', params, config);
+};
+
+// 获取用户信息
+exports.wxAuthLoginReq = wxAuthLoginReq;
+var getUserInfoReq = function getUserInfoReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.get('/api/users/getUserInfo', params, config);
+};
+
+// 更新用户信息
+exports.getUserInfoReq = getUserInfoReq;
+var updateUserInfoReq = function updateUserInfoReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.post('/api/users/updateUserInfo', params, config);
+};
+
+// 首页相关
+// 获取首页配置
+exports.updateUserInfoReq = updateUserInfoReq;
+var getIndexConfigReq = function getIndexConfigReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.get('/api/getHomeData', params, config);
+};
+
+// 订单相关相关
+// 提交订单
+exports.getIndexConfigReq = getIndexConfigReq;
+var postOrderReq = function postOrderReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.post('/api/order/submitOrder', params, config);
+};
+
+// 获取订单详细
+exports.postOrderReq = postOrderReq;
+var getOrderDetailReq = function getOrderDetailReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var apiUrl = '/api/order/getOrderDetail';
+  Object.keys(params).forEach(function (item, index) {
+    if (index == 0) {
+      apiUrl += "?".concat(item, "=").concat(params[item]);
+    } else {
+      apiUrl += "&".concat(item, "=").concat(params[item]);
+    }
+  });
+  console.log('处理后的apiUrl', apiUrl);
+  return http.get(apiUrl, params, config);
+};
+
+// 获取商城分类数据
+exports.getOrderDetailReq = getOrderDetailReq;
+var getMallCatReq = function getMallCatReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.get('/api/goods/getClassifyData', params, config);
+};
+
+// 获取商城数据
+exports.getMallCatReq = getMallCatReq;
+var getMallReq = function getMallReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var apiUrl = '/api/goods/getGoodsData';
+  Object.keys(params).forEach(function (item, index) {
+    if (index == 0) {
+      apiUrl += "?".concat(item, "=").concat(params[item]);
+    } else {
+      apiUrl += "&".concat(item, "=").concat(params[item]);
+    }
+  });
+  console.log('处理后的apiUrl', apiUrl);
+  return http.get(apiUrl, params, config);
+};
+
+// 获取商城分类数据
+exports.getMallReq = getMallReq;
+var getSerDocReq = function getSerDocReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.get('/api/server/getServerData', params, config);
+};
+
+// 获取各个身份的价格百分比
+exports.getSerDocReq = getSerDocReq;
+var getPricePercentReq = function getPricePercentReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.get('/api/common/getPriceConfig', params, config);
+};
+
+// 获取我的售后保障
+exports.getPricePercentReq = getPricePercentReq;
+var getSerBackReq = function getSerBackReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.get('/api/users/getMyAfterSaleData', params, config);
+};
+
+// 获取我的服务流程
+exports.getSerBackReq = getSerBackReq;
+var getSerStepReq = function getSerStepReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.get('/api/users/getMyServiceProcess', params, config);
+};
+
+// 获取我的售后商品
+exports.getSerStepReq = getSerStepReq;
+var getSerBackGoodsReq = function getSerBackGoodsReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var apiUrl = '/api/users/getMyAfterSaleGoods';
+  Object.keys(params).forEach(function (item, index) {
+    if (index == 0) {
+      apiUrl += "?".concat(item, "=").concat(params[item]);
+    } else {
+      apiUrl += "&".concat(item, "=").concat(params[item]);
+    }
+  });
+  console.log('处理后的apiUrl', apiUrl);
+  return http.get(apiUrl, params, config);
+};
+
+//获取我的售后联系
+exports.getSerBackGoodsReq = getSerBackGoodsReq;
+var getSerBackConReq = function getSerBackConReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.get('/api/users/getMyAfterSaleContact', params, config);
+};
+
+// 提交邀请
+exports.getSerBackConReq = getSerBackConReq;
+var postInviteReq = function postInviteReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.post('/api/invite/submitInviteData', params, config);
+};
+
+//获取我的邀请
+exports.postInviteReq = postInviteReq;
+var getMyInviteReq = function getMyInviteReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var apiUrl = '/api/invite/getMyInviteData';
+  Object.keys(params).forEach(function (item, index) {
+    if (index == 0) {
+      apiUrl += "?".concat(item, "=").concat(params[item]);
+    } else {
+      apiUrl += "&".concat(item, "=").concat(params[item]);
+    }
+  });
+  console.log('处理后的apiUrl', apiUrl);
+  return http.get(apiUrl, params, config);
+};
+
+// 添加邀请
+exports.getMyInviteReq = getMyInviteReq;
+var addInviteReq = function addInviteReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.post('/api/invite/addInvite', params, config);
+};
+
+// 添加收藏
+exports.addInviteReq = addInviteReq;
+var addCollReq = function addCollReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.post('/api/users/addCollect', params, config);
+};
+
+// 取消收藏
+exports.addCollReq = addCollReq;
+var cancelCollReq = function cancelCollReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.post('/api/users/cancelCollect', params, config);
+};
+
+//获取活动商品
+exports.cancelCollReq = cancelCollReq;
+var getActGoodsReq = function getActGoodsReq(params) {
+  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return http.get('/api/getActivityData', params, config);
+};
+exports.getActGoodsReq = getActGoodsReq;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+
+/***/ }),
 /* 229 */,
 /* 230 */,
 /* 231 */,
@@ -23303,7 +23500,24 @@ module.exports = {
 /* 238 */,
 /* 239 */,
 /* 240 */,
-/* 241 */
+/* 241 */,
+/* 242 */,
+/* 243 */,
+/* 244 */,
+/* 245 */,
+/* 246 */,
+/* 247 */,
+/* 248 */,
+/* 249 */,
+/* 250 */,
+/* 251 */,
+/* 252 */,
+/* 253 */,
+/* 254 */,
+/* 255 */,
+/* 256 */,
+/* 257 */,
+/* 258 */
 /*!***********************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/libs/mixin/button.js ***!
   \***********************************************************************/
@@ -23333,7 +23547,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 242 */
+/* 259 */
 /*!*************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/libs/mixin/openType.js ***!
   \*************************************************************************/
@@ -23375,7 +23589,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 243 */
+/* 260 */
 /*!*******************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-button/props.js ***!
   \*******************************************************************************/
@@ -23554,14 +23768,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 244 */,
-/* 245 */,
-/* 246 */,
-/* 247 */,
-/* 248 */,
-/* 249 */,
-/* 250 */,
-/* 251 */
+/* 261 */,
+/* 262 */,
+/* 263 */,
+/* 264 */,
+/* 265 */,
+/* 266 */,
+/* 267 */,
+/* 268 */
 /*!*******************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-sticky/props.js ***!
   \*******************************************************************************/
@@ -23613,14 +23827,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 252 */,
-/* 253 */,
-/* 254 */,
-/* 255 */,
-/* 256 */,
-/* 257 */,
-/* 258 */,
-/* 259 */
+/* 269 */,
+/* 270 */,
+/* 271 */,
+/* 272 */,
+/* 273 */,
+/* 274 */,
+/* 275 */,
+/* 276 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-tabs/props.js ***!
   \*****************************************************************************/
@@ -23702,14 +23916,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 260 */,
-/* 261 */,
-/* 262 */,
-/* 263 */,
-/* 264 */,
-/* 265 */,
-/* 266 */,
-/* 267 */
+/* 277 */,
+/* 278 */,
+/* 279 */,
+/* 280 */,
+/* 281 */,
+/* 282 */,
+/* 283 */,
+/* 284 */
 /*!******************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-popup/props.js ***!
   \******************************************************************************/
@@ -23806,14 +24020,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 268 */,
-/* 269 */,
-/* 270 */,
-/* 271 */,
-/* 272 */,
-/* 273 */,
-/* 274 */,
-/* 275 */
+/* 285 */,
+/* 286 */,
+/* 287 */,
+/* 288 */,
+/* 289 */,
+/* 290 */,
+/* 291 */,
+/* 292 */
 /*!************************************************************************!*\
   !*** D:/desktop/jiancaiPro/components/wike-painter/common/relation.js ***!
   \************************************************************************/
@@ -23980,7 +24194,7 @@ function children(parent) {
 }
 
 /***/ }),
-/* 276 */
+/* 293 */
 /*!**************************************************************!*\
   !*** D:/desktop/jiancaiPro/components/wike-painter/props.js ***!
   \**************************************************************/
@@ -24036,7 +24250,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 277 */
+/* 294 */
 /*!**************************************************************!*\
   !*** D:/desktop/jiancaiPro/components/wike-painter/utils.js ***!
   \**************************************************************/
@@ -24313,7 +24527,7 @@ function downloadFile(url) {
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"]))
 
 /***/ }),
-/* 278 */
+/* 295 */
 /*!****************************************************************!*\
   !*** D:/desktop/jiancaiPro/components/wike-painter/painter.js ***!
   \****************************************************************/
@@ -26398,14 +26612,21 @@ n.WEB == B && (window.Painter = yt);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"]))
 
 /***/ }),
-/* 279 */,
-/* 280 */,
-/* 281 */,
-/* 282 */,
-/* 283 */,
-/* 284 */,
-/* 285 */,
-/* 286 */
+/* 296 */,
+/* 297 */,
+/* 298 */,
+/* 299 */,
+/* 300 */,
+/* 301 */,
+/* 302 */,
+/* 303 */,
+/* 304 */,
+/* 305 */,
+/* 306 */,
+/* 307 */,
+/* 308 */,
+/* 309 */,
+/* 310 */
 /*!*********************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uni-icons/components/uni-icons/icons.js ***!
   \*********************************************************************************/
@@ -27426,14 +27647,14 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 287 */,
-/* 288 */,
-/* 289 */,
-/* 290 */,
-/* 291 */,
-/* 292 */,
-/* 293 */,
-/* 294 */
+/* 311 */,
+/* 312 */,
+/* 313 */,
+/* 314 */,
+/* 315 */,
+/* 316 */,
+/* 317 */,
+/* 318 */
 /*!*************************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-loading-icon/props.js ***!
   \*************************************************************************************/
@@ -27510,14 +27731,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 295 */,
-/* 296 */,
-/* 297 */,
-/* 298 */,
-/* 299 */,
-/* 300 */,
-/* 301 */,
-/* 302 */
+/* 319 */,
+/* 320 */,
+/* 321 */,
+/* 322 */,
+/* 323 */,
+/* 324 */,
+/* 325 */,
+/* 326 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-icon/icons.js ***!
   \*****************************************************************************/
@@ -27748,7 +27969,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 303 */
+/* 327 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-icon/props.js ***!
   \*****************************************************************************/
@@ -27855,14 +28076,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 304 */,
-/* 305 */,
-/* 306 */,
-/* 307 */,
-/* 308 */,
-/* 309 */,
-/* 310 */,
-/* 311 */
+/* 328 */,
+/* 329 */,
+/* 330 */,
+/* 331 */,
+/* 332 */,
+/* 333 */,
+/* 334 */,
+/* 335 */
 /*!******************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-badge/props.js ***!
   \******************************************************************************/
@@ -27952,14 +28173,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 312 */,
-/* 313 */,
-/* 314 */,
-/* 315 */,
-/* 316 */,
-/* 317 */,
-/* 318 */,
-/* 319 */
+/* 336 */,
+/* 337 */,
+/* 338 */,
+/* 339 */,
+/* 340 */,
+/* 341 */,
+/* 342 */,
+/* 343 */
 /*!********************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-overlay/props.js ***!
   \********************************************************************************/
@@ -28001,14 +28222,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 320 */,
-/* 321 */,
-/* 322 */,
-/* 323 */,
-/* 324 */,
-/* 325 */,
-/* 326 */,
-/* 327 */
+/* 344 */,
+/* 345 */,
+/* 346 */,
+/* 347 */,
+/* 348 */,
+/* 349 */,
+/* 350 */,
+/* 351 */
 /*!***********************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-transition/props.js ***!
   \***********************************************************************************/
@@ -28050,7 +28271,7 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 328 */
+/* 352 */
 /*!****************************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-transition/transition.js ***!
   \****************************************************************************************/
@@ -28067,7 +28288,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 55));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 57));
-var _nvueAniMap = _interopRequireDefault(__webpack_require__(/*! ./nvue.ani-map.js */ 329));
+var _nvueAniMap = _interopRequireDefault(__webpack_require__(/*! ./nvue.ani-map.js */ 353));
 // 定义一个一定时间后自动成功的promise，让调用nextTick方法处，进入下一个then方法
 var nextTick = function nextTick() {
   return new Promise(function (resolve) {
@@ -28159,7 +28380,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 329 */
+/* 353 */
 /*!******************************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-transition/nvue.ani-map.js ***!
   \******************************************************************************************/
@@ -28352,14 +28573,14 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 330 */,
-/* 331 */,
-/* 332 */,
-/* 333 */,
-/* 334 */,
-/* 335 */,
-/* 336 */,
-/* 337 */
+/* 354 */,
+/* 355 */,
+/* 356 */,
+/* 357 */,
+/* 358 */,
+/* 359 */,
+/* 360 */,
+/* 361 */
 /*!***********************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-status-bar/props.js ***!
   \***********************************************************************************/
@@ -28385,14 +28606,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 338 */,
-/* 339 */,
-/* 340 */,
-/* 341 */,
-/* 342 */,
-/* 343 */,
-/* 344 */,
-/* 345 */
+/* 362 */,
+/* 363 */,
+/* 364 */,
+/* 365 */,
+/* 366 */,
+/* 367 */,
+/* 368 */,
+/* 369 */
 /*!************************************************************************************!*\
   !*** D:/desktop/jiancaiPro/uni_modules/uview-ui/components/u-safe-bottom/props.js ***!
   \************************************************************************************/
@@ -28411,6 +28632,154 @@ var _default = {
 };
 exports.default = _default;
 
+/***/ }),
+/* 370 */,
+/* 371 */,
+/* 372 */,
+/* 373 */,
+/* 374 */,
+/* 375 */,
+/* 376 */,
+/* 377 */,
+/* 378 */,
+/* 379 */,
+/* 380 */,
+/* 381 */,
+/* 382 */,
+/* 383 */,
+/* 384 */
+/*!*****************************************************************************************************!*\
+  !*** D:/desktop/jiancaiPro/uni_modules/uni-transition/components/uni-transition/createAnimation.js ***!
+  \*****************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
+
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createAnimation = createAnimation;
+var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
+var _classCallCheck2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/classCallCheck */ 23));
+var _createClass2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/createClass */ 24));
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+var MPAnimation = /*#__PURE__*/function () {
+  function MPAnimation(options, _this) {
+    (0, _classCallCheck2.default)(this, MPAnimation);
+    this.options = options;
+    // 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误
+    this.animation = uni.createAnimation(_objectSpread({}, options));
+    this.currentStepAnimates = {};
+    this.next = 0;
+    this.$ = _this;
+  }
+  (0, _createClass2.default)(MPAnimation, [{
+    key: "_nvuePushAnimates",
+    value: function _nvuePushAnimates(type, args) {
+      var aniObj = this.currentStepAnimates[this.next];
+      var styles = {};
+      if (!aniObj) {
+        styles = {
+          styles: {},
+          config: {}
+        };
+      } else {
+        styles = aniObj;
+      }
+      if (animateTypes1.includes(type)) {
+        if (!styles.styles.transform) {
+          styles.styles.transform = '';
+        }
+        var unit = '';
+        if (type === 'rotate') {
+          unit = 'deg';
+        }
+        styles.styles.transform += "".concat(type, "(").concat(args + unit, ") ");
+      } else {
+        styles.styles[type] = "".concat(args);
+      }
+      this.currentStepAnimates[this.next] = styles;
+    }
+  }, {
+    key: "_animateRun",
+    value: function _animateRun() {
+      var styles = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var ref = this.$.$refs['ani'].ref;
+      if (!ref) return;
+      return new Promise(function (resolve, reject) {
+        nvueAnimation.transition(ref, _objectSpread({
+          styles: styles
+        }, config), function (res) {
+          resolve();
+        });
+      });
+    }
+  }, {
+    key: "_nvueNextAnimate",
+    value: function _nvueNextAnimate(animates) {
+      var _this2 = this;
+      var step = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
+      var fn = arguments.length > 2 ? arguments[2] : undefined;
+      var obj = animates[step];
+      if (obj) {
+        var styles = obj.styles,
+          config = obj.config;
+        this._animateRun(styles, config).then(function () {
+          step += 1;
+          _this2._nvueNextAnimate(animates, step, fn);
+        });
+      } else {
+        this.currentStepAnimates = {};
+        typeof fn === 'function' && fn();
+        this.isEnd = true;
+      }
+    }
+  }, {
+    key: "step",
+    value: function step() {
+      var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      this.animation.step(config);
+      return this;
+    }
+  }, {
+    key: "run",
+    value: function run(fn) {
+      this.$.animationData = this.animation.export();
+      this.$.timer = setTimeout(function () {
+        typeof fn === 'function' && fn();
+      }, this.$.durationTime);
+    }
+  }]);
+  return MPAnimation;
+}();
+var animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d', 'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY', 'translateZ'];
+var animateTypes2 = ['opacity', 'backgroundColor'];
+var animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom'];
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(function (type) {
+  MPAnimation.prototype[type] = function () {
+    var _this$animation;
+    (_this$animation = this.animation)[type].apply(_this$animation, arguments);
+    return this;
+  };
+});
+function createAnimation(option, _this) {
+  if (!_this) return;
+  clearTimeout(_this.timer);
+  return new MPAnimation(option, _this);
+}
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+
 /***/ })
 ]]);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/common/vendor.js.map

unpackage/dist/dev/mp-weixin/components/privacyPopup/index.json

@@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-popup": "/uni_modules/uni-popup/components/uni-popup/uni-popup"
+  },
+  "component": true
+}

unpackage/dist/dev/mp-weixin/components/privacyPopup/index.wxml

@@ -0,0 +1 @@
+<uni-popup vue-id="4a802978-1" type="center" is-mask-click="{{false}}" data-ref="popup" class="data-v-7aab5602 vue-ref" bind:__l="__l" vue-slots="{{['default']}}"><view class="popup-box data-v-7aab5602"><view class="weui-half-screen-dialog__hd data-v-7aab5602">{{''+title+''}}</view><view class="weui-half-screen-dialog__bd data-v-7aab5602"><text class="weui-half-screen-dialog__tips data-v-7aab5602">{{desc1}}</text><text data-event-opts="{{[['tap',[['openPrivacyContract',['$event']]]]]}}" class="weui-half-screen-dialog__tips color-8BC21F data-v-7aab5602" bindtap="__e">{{''+urlTitle+''}}</text><text class="weui-half-screen-dialog__tips data-v-7aab5602">{{desc2}}</text></view><view class="weui-half-screen-dialog__ft data-v-7aab5602"><button data-event-opts="{{[['tap',[['handleDisagree',['$event']]]]]}}" class="weui-btn data-v-7aab5602" bindtap="__e">拒绝</button><button class="weui-btn agree data-v-7aab5602" id="agree-btn" type="default" open-type="agreePrivacyAuthorization" data-event-opts="{{[['agreeprivacyauthorization',[['handleAgreePrivacyAuthorization',['$event']]]]]}}" bindagreeprivacyauthorization="__e">同意</button></view></view></uni-popup>

unpackage/dist/dev/mp-weixin/components/privacyPopup/index.wxss

@@ -0,0 +1,52 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.popup-box.data-v-7aab5602 {
+  width: 80vw;
+  overflow: hidden;
+  background: #ffffff;
+  padding: 30rpx;
+  border-radius: 24rpx;
+}
+.popup-box .weui-half-screen-dialog__hd.data-v-7aab5602 {
+  font-size: 48rpx;
+  font-family: Source Han Sans CN-Bold, Source Han Sans CN;
+  font-weight: bold;
+  color: #000000;
+  line-height: 56rpx;
+}
+.popup-box .weui-half-screen-dialog__bd.data-v-7aab5602 {
+  margin-top: 48rpx;
+  text-indent: 2em;
+}
+.popup-box .weui-half-screen-dialog__bd .weui-half-screen-dialog__tips.data-v-7aab5602 {
+  font-size: 28rpx;
+  font-family: Source Han Sans CN-Normal, Source Han Sans CN;
+  font-weight: 400;
+  color: #000000;
+  line-height: 33rpx;
+}
+.popup-box .weui-half-screen-dialog__ft.data-v-7aab5602 {
+  display: flex;
+  justify-content: space-evenly;
+  align-items: center;
+  margin-top: 48rpx;
+}
+.popup-box .weui-half-screen-dialog__ft .weui-btn.data-v-7aab5602 {
+  padding: 0 60rpx;
+  margin: 0;
+  background: none;
+  font-size: 32rpx;
+  font-family: Source Han Sans CN-Normal, Source Han Sans CN;
+  font-weight: 400;
+  color: #000000;
+  line-height: 80rpx;
+}
+.popup-box .weui-half-screen-dialog__ft .agree.data-v-7aab5602 {
+  color: #ffffff;
+  background: linear-gradient(90deg, #8BC21F 0%, #7AB30A 100%);
+}
+.popup-box .color-8BC21F.data-v-7aab5602 {
+  color: #8BC21F !important;
+}
+

unpackage/dist/dev/mp-weixin/components/wike-painter/wike-painter.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["components/wike-painter/wike-painter"],{
 
-/***/ 270:
+/***/ 287:
 /*!**********************************************************************!*\
   !*** D:/desktop/jiancaiPro/components/wike-painter/wike-painter.vue ***!
   \**********************************************************************/
@@ -9,10 +9,10 @@
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _wike_painter_vue_vue_type_template_id_4a5229c4___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./wike-painter.vue?vue&type=template&id=4a5229c4& */ 271);
-/* harmony import */ var _wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./wike-painter.vue?vue&type=script&lang=js& */ 273);
+/* harmony import */ var _wike_painter_vue_vue_type_template_id_4a5229c4___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./wike-painter.vue?vue&type=template&id=4a5229c4& */ 288);
+/* harmony import */ var _wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./wike-painter.vue?vue&type=script&lang=js& */ 290);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
-/* harmony import */ var _wike_painter_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./wike-painter.vue?vue&type=style&index=0&lang=css& */ 279);
+/* harmony import */ var _wike_painter_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./wike-painter.vue?vue&type=style&index=0&lang=css& */ 296);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
 
 var renderjs
@@ -41,7 +41,7 @@ component.options.__file = "components/wike-painter/wike-painter.vue"
 
 /***/ }),
 
-/***/ 271:
+/***/ 288:
 /*!*****************************************************************************************************!*\
   !*** D:/desktop/jiancaiPro/components/wike-painter/wike-painter.vue?vue&type=template&id=4a5229c4& ***!
   \*****************************************************************************************************/
@@ -50,7 +50,7 @@ component.options.__file = "components/wike-painter/wike-painter.vue"
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_template_id_4a5229c4___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./wike-painter.vue?vue&type=template&id=4a5229c4& */ 272);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_template_id_4a5229c4___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./wike-painter.vue?vue&type=template&id=4a5229c4& */ 289);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_template_id_4a5229c4___WEBPACK_IMPORTED_MODULE_0__["render"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_template_id_4a5229c4___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
@@ -63,7 +63,7 @@ __webpack_require__.r(__webpack_exports__);
 
 /***/ }),
 
-/***/ 272:
+/***/ 289:
 /*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/desktop/jiancaiPro/components/wike-painter/wike-painter.vue?vue&type=template&id=4a5229c4& ***!
   \*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -90,7 +90,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 273:
+/***/ 290:
 /*!***********************************************************************************************!*\
   !*** D:/desktop/jiancaiPro/components/wike-painter/wike-painter.vue?vue&type=script&lang=js& ***!
   \***********************************************************************************************/
@@ -99,14 +99,14 @@ render._withStripped = true
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./wike-painter.vue?vue&type=script&lang=js& */ 274);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./wike-painter.vue?vue&type=script&lang=js& */ 291);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 274:
+/***/ 291:
 /*!******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/desktop/jiancaiPro/components/wike-painter/wike-painter.vue?vue&type=script&lang=js& ***!
   \******************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -123,10 +123,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ 55));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ 57));
-var _relation = __webpack_require__(/*! ./common/relation */ 275);
-var _props = _interopRequireDefault(__webpack_require__(/*! ./props */ 276));
-var _utils = __webpack_require__(/*! ./utils */ 277);
-var _painter = _interopRequireDefault(__webpack_require__(/*! ./painter */ 278));
+var _relation = __webpack_require__(/*! ./common/relation */ 292);
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props */ 293));
+var _utils = __webpack_require__(/*! ./utils */ 294);
+var _painter = _interopRequireDefault(__webpack_require__(/*! ./painter */ 295));
 //
 //
 //
@@ -690,7 +690,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 279:
+/***/ 296:
 /*!*******************************************************************************************************!*\
   !*** D:/desktop/jiancaiPro/components/wike-painter/wike-painter.vue?vue&type=style&index=0&lang=css& ***!
   \*******************************************************************************************************/
@@ -699,14 +699,14 @@ exports.default = _default;
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./wike-painter.vue?vue&type=style&index=0&lang=css& */ 280);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../HBuilderX/plugins/uniapp-cli/node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!../../../../HBuilderX/plugins/uniapp-cli/node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!../../../../HBuilderX/plugins/uniapp-cli/node_modules/postcss-loader/src??ref--6-oneOf-1-3!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./wike-painter.vue?vue&type=style&index=0&lang=css& */ 297);
 /* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__);
 /* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
  /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_mini_css_extract_plugin_dist_loader_js_ref_6_oneOf_1_0_HBuilderX_plugins_uniapp_cli_node_modules_css_loader_dist_cjs_js_ref_6_oneOf_1_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_stylePostLoader_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_6_oneOf_1_2_HBuilderX_plugins_uniapp_cli_node_modules_postcss_loader_src_index_js_ref_6_oneOf_1_3_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_wike_painter_vue_vue_type_style_index_0_lang_css___WEBPACK_IMPORTED_MODULE_0___default.a); 
 
 /***/ }),
 
-/***/ 280:
+/***/ 297:
 /*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./node_modules/mini-css-extract-plugin/dist/loader.js??ref--6-oneOf-1-0!./node_modules/css-loader/dist/cjs.js??ref--6-oneOf-1-1!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/stylePostLoader.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--6-oneOf-1-2!./node_modules/postcss-loader/src??ref--6-oneOf-1-3!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/desktop/jiancaiPro/components/wike-painter/wike-painter.vue?vue&type=style&index=0&lang=css& ***!
   \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -725,7 +725,7 @@ __webpack_require__.r(__webpack_exports__);
     'components/wike-painter/wike-painter-create-component',
     {
         'components/wike-painter/wike-painter-create-component':(function(module, exports, __webpack_require__){
-            __webpack_require__('2')['createComponent'](__webpack_require__(270))
+            __webpack_require__('2')['createComponent'](__webpack_require__(287))
         })
     },
     [['components/wike-painter/wike-painter-create-component']]

unpackage/dist/dev/mp-weixin/pages/category/index.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uSticky: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-sticky/u-sticky */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-sticky/u-sticky")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-sticky/u-sticky.vue */ 246))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-sticky/u-sticky */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-sticky/u-sticky")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-sticky/u-sticky.vue */ 263))
     },
     uTabs: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabs/u-tabs.vue */ 254))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabs/u-tabs.vue */ 271))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uButton: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-button/u-button.vue */ 236))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-button/u-button.vue */ 253))
     },
   }
 } catch (e) {

unpackage/dist/dev/mp-weixin/pages/my/index.js

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uButton: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-button/u-button.vue */ 236))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-button/u-button */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-button/u-button")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-button/u-button.vue */ 253))
     },
   }
 } catch (e) {
@@ -158,7 +158,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {
+/* WEBPACK VAR INJECTION */(function(wx, uni) {
 
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
@@ -203,6 +203,14 @@ var _config = _interopRequireDefault(__webpack_require__(/*! @/common/config.js
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
   // components: {
@@ -210,6 +218,7 @@ var _default = {
   // },
   data: function data() {
     return {
+      showPrivacy: true,
       avatarUrl: '',
       nickName: '',
       PhoneCode: '',
@@ -220,14 +229,45 @@ var _default = {
       user_name: ''
     };
   },
+  onLoad: function onLoad() {
+    var _this2 = this;
+    wx.onNeedPrivacyAuthorization(function (resolve, eventInfo) {
+      console.log('触发本次事件的接口是：' + eventInfo.referrer);
+      // 需要用户同意隐私授权时
+      // 弹出开发者自定义的隐私授权弹窗
+      _this2.showPrivacy = true;
+      _this2.resolvePrivacyAuthorization = resolve;
+    });
+
+    // wx.getUserProfile({
+    // 	success: console.log,
+    // 	fail: console.error
+    // })
+  },
+
   methods: {
+    handleAgreePrivacyAuthorization: function handleAgreePrivacyAuthorization() {
+      // 用户点击同意按钮后
+      this.resolvePrivacyAuthorization({
+        buttonId: 'agree-btn',
+        event: 'agree'
+      });
+      // 用户点击同意后，开发者调用 resolve({ buttonId: 'agree-btn', event: 'agree' })  告知平台用户已经同意，参数传同意按钮的id。为确保用户有同意的操作，基础库在 resolve 被调用后，会去检查对应的同意按钮有没有被点击过。检查通过后，相关隐私接口会继续调用
+      // 用户点击拒绝后，开发者调用 resolve({ event:'disagree' }) 告知平台用户已经拒绝
+    },
+    testPrcBox: function testPrcBox() {
+      // wx.onNeedPrivacyAuthorization(function callback)
+      uni.navigateTo({
+        url: '/pages/privicyPopup/index'
+      });
+    },
     genQr: function genQr() {
       uni.navigateTo({
         url: '/pages/qrPage/index'
       });
     },
     get_user: function get_user() {
-      var _this2 = this;
+      var _this3 = this;
       // 获取用户信息
       var _this = this;
       // uni.getUserProfile({
@@ -244,8 +284,8 @@ var _default = {
         success: function success(infoRes) {
           console.log('getUserInfo返回值：', infoRes);
           console.log('用户昵称为：' + infoRes.userInfo.nickName, infoRes.userInfo.avatarUrl);
-          _this2.user_img = infoRes.userInfo.avatarUrl; //微信头像
-          _this2.user_name = infoRes.userInfo.nickName; // 微信昵称
+          _this3.user_img = infoRes.userInfo.avatarUrl; //微信头像
+          _this3.user_name = infoRes.userInfo.nickName; // 微信昵称
 
           // _this.upImg(infoRes.userInfo.avatarUrl)
         }
@@ -272,15 +312,16 @@ var _default = {
         },
         formData: {
           'fileType': 'images',
-          'dirName': 'cert'
+          'dirName': 'cert',
+          'tag': 'lamp'
         },
         success: function success(uploadRes) {
           var result = JSON.parse(uploadRes.data);
           // localStorage.set('imgUrl', result.data.fileUrl)
           if (result.code == 0) {
-            _this.avatarUrl = result.data.url;
+            _this.avatarUrl = result.data.file;
             // _this.user_img = result.data.url
-            console.log('上传后的头像url地址', result.data.url);
+            console.log('上传后的头像url地址', result.data.file);
           }
         },
         fail: function fail(err) {
@@ -299,7 +340,7 @@ var _default = {
           console.log('uni.login返回值：', res);
           if (res.errMsg == 'login:ok') {
             // 获取密钥 === 需要登录才可以获取密钥
-            // return
+            return;
             uni.request({
               url: 'https://api.weixin.qq.com/sns/jscode2session',
               // 请求微信服务器
@@ -337,7 +378,7 @@ var _default = {
   }
 };
 exports.default = _default;
-/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
 

unpackage/dist/dev/mp-weixin/pages/privicyPopup/index.json

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "隐私弹窗页面",
+  "usingComponents": {
+    "privacy-popup": "/components/privacyPopup/index"
+  }
+}

unpackage/dist/dev/mp-weixin/pages/privicyPopup/index.wxml

@@ -0,0 +1 @@
+<view class="page data-v-ace62a90"><nav-bar vue-id="efde2564-1" title="隐私弹窗" back="{{true}}" color="white" background="green" class="data-v-ace62a90" bind:__l="__l"></nav-bar><block wx:if="{{showPrivacy}}"><button data-event-opts="{{[['tap',[['getPrivacy',['$event']]]]]}}" class="btn data-v-ace62a90" bindtap="__e">获取头像</button></block><block wx:else><button class="btn data-v-ace62a90" open-type="chooseAvatar" data-event-opts="{{[['chooseavatar',[['onChooseAvatar',['$event']]]]]}}" bindchooseavatar="__e">获取头像</button></block><privacy-popup bind:confirm="__e" vue-id="efde2564-2" data-ref="privacyPopup" data-event-opts="{{[['^confirm',[['confirm']]]]}}" class="data-v-ace62a90 vue-ref" bind:__l="__l"></privacy-popup></view>

unpackage/dist/dev/mp-weixin/pages/privicyPopup/index.wxss

@@ -0,0 +1,4 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+

unpackage/dist/dev/mp-weixin/pages/qrPage/index.js

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uPopup: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 262))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 279))
     },
     wikePainter: function () {
-      return Promise.all(/*! import() | components/wike-painter/wike-painter */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/wike-painter/wike-painter")]).then(__webpack_require__.bind(null, /*! @/components/wike-painter/wike-painter.vue */ 270))
+      return Promise.all(/*! import() | components/wike-painter/wike-painter */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/wike-painter/wike-painter")]).then(__webpack_require__.bind(null, /*! @/components/wike-painter/wike-painter.vue */ 287))
     },
   }
 } catch (e) {
@@ -183,7 +183,7 @@ var _streamDown = __webpack_require__(/*! @/utils/streamDown.js */ 218);
 var _config = _interopRequireDefault(__webpack_require__(/*! @/common/config.js */ 200));
 var wikePainter = function wikePainter() {
   Promise.all(/*! require.ensure | components/wike-painter/wike-painter */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/wike-painter/wike-painter")]).then((function () {
-    return resolve(__webpack_require__(/*! @/components/wike-painter/wike-painter.vue */ 270));
+    return resolve(__webpack_require__(/*! @/components/wike-painter/wike-painter.vue */ 287));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var util = __webpack_require__(/*! @/utils/decodeQrQuery.js */ 219);
@@ -299,9 +299,10 @@ var _default = {
         url: "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=".concat(access_token),
         responseType: 'arraybuffer',
         data: JSON.stringify({
-          scene: 'kcardCode=123456',
+          // scene: 'kcardCode=123456',
           // page: 'pages/qrPage/index',
-          page: 'pages/index/index',
+          scene: 'a=1-b=2-c=李万涛',
+          page: 'pages/my/index',
           check_path: false
         }),
         header: {

unpackage/dist/dev/mp-weixin/pages/test/index.json

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "接口测试页面",
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/pages/test/index.wxss

@@ -0,0 +1,4 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -7,6 +7,20 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "授权",
+          "pathName": "pages/privicyPopup/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "接口测试页面",
+          "pathName": "pages/test/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
         {
           "name": "我的",
           "pathName": "pages/my/index",

unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.json

@@ -0,0 +1,6 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-transition": "/uni_modules/uni-transition/components/uni-transition/uni-transition"
+  }
+}

unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml

@@ -0,0 +1 @@
+<block wx:if="{{showPopup}}"><view class="{{['uni-popup',popupstyle,isDesktop?'fixforpc-z-index':'']}}"><view data-event-opts="{{[['touchstart',[['touchstart',['$event']]]]]}}" bindtouchstart="__e"><block wx:if="{{maskShow}}"><uni-transition vue-id="0c37304b-1" name="mask" mode-class="fade" styles="{{maskClass}}" duration="{{duration}}" show="{{showTrans}}" data-event-opts="{{[['^click',[['onTap']]]]}}" bind:click="__e" bind:__l="__l"></uni-transition></block><uni-transition vue-id="0c37304b-2" mode-class="{{ani}}" name="content" styles="{{transClass}}" duration="{{duration}}" show="{{showTrans}}" data-event-opts="{{[['^click',[['onTap']]]]}}" bind:click="__e" bind:__l="__l" vue-slots="{{['default']}}"><view data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" class="{{['uni-popup__wrapper',popupstyle]}}" style="{{'background-color:'+(bg)+';'}}" bindtap="__e"><slot></slot></view></uni-transition></view></view></block>

unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxss

@@ -0,0 +1,26 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+.uni-popup {
+  position: fixed;
+  z-index: 99;
+}
+.uni-popup.top, .uni-popup.left, .uni-popup.right {
+  top: 0;
+}
+.uni-popup .uni-popup__wrapper {
+  display: block;
+  position: relative;
+  /* iphonex 等安全区设置，底部安全区适配 */
+}
+.uni-popup .uni-popup__wrapper.left, .uni-popup .uni-popup__wrapper.right {
+  padding-top: 0;
+  flex: 1;
+}
+.fixforpc-z-index {
+  z-index: 999;
+}
+.fixforpc-top {
+  top: 0;
+}
+

unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js

@@ -0,0 +1,420 @@
+(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["uni_modules/uni-transition/components/uni-transition/uni-transition"],{
+
+/***/ 379:
+/*!*****************************************************************************************************!*\
+  !*** D:/desktop/jiancaiPro/uni_modules/uni-transition/components/uni-transition/uni-transition.vue ***!
+  \*****************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./uni-transition.vue?vue&type=template&id=6369f8c4& */ 380);
+/* harmony import */ var _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./uni-transition.vue?vue&type=script&lang=js& */ 382);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/runtime/componentNormalizer.js */ 32);
+
+var renderjs
+
+
+
+
+/* normalize component */
+
+var component = Object(_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
+  _uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
+  _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["render"],
+  _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
+  false,
+  null,
+  null,
+  null,
+  false,
+  _uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["components"],
+  renderjs
+)
+
+component.options.__file = "uni_modules/uni-transition/components/uni-transition/uni-transition.vue"
+/* harmony default export */ __webpack_exports__["default"] = (component.exports);
+
+/***/ }),
+
+/***/ 380:
+/*!************************************************************************************************************************************!*\
+  !*** D:/desktop/jiancaiPro/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=template&id=6369f8c4& ***!
+  \************************************************************************************************************************************/
+/*! exports provided: render, staticRenderFns, recyclableRender, components */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-transition.vue?vue&type=template&id=6369f8c4& */ 381);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["render"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["recyclableRender"]; });
+
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "components", function() { return _HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_17_0_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_template_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_uni_app_loader_page_meta_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_template_id_6369f8c4___WEBPACK_IMPORTED_MODULE_0__["components"]; });
+
+
+
+/***/ }),
+
+/***/ 381:
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--17-0!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/template.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-uni-app-loader/page-meta.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/desktop/jiancaiPro/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=template&id=6369f8c4& ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! exports provided: render, staticRenderFns, recyclableRender, components */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "recyclableRender", function() { return recyclableRender; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "components", function() { return components; });
+var components
+var render = function () {
+  var _vm = this
+  var _h = _vm.$createElement
+  var _c = _vm._self._c || _h
+}
+var recyclableRender = false
+var staticRenderFns = []
+render._withStripped = true
+
+
+
+/***/ }),
+
+/***/ 382:
+/*!******************************************************************************************************************************!*\
+  !*** D:/desktop/jiancaiPro/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=script&lang=js& ***!
+  \******************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/babel-loader/lib!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!../../../../../../HBuilderX/plugins/uniapp-cli/node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!./uni-transition.vue?vue&type=script&lang=js& */ 383);
+/* harmony import */ var _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__);
+/* harmony reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__) if(["default"].indexOf(__WEBPACK_IMPORT_KEY__) < 0) (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return _HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__[key]; }) }(__WEBPACK_IMPORT_KEY__));
+ /* harmony default export */ __webpack_exports__["default"] = (_HBuilderX_plugins_uniapp_cli_node_modules_babel_loader_lib_index_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_webpack_preprocess_loader_index_js_ref_13_1_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_script_js_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_vue_cli_plugin_uni_packages_vue_loader_lib_index_js_vue_loader_options_HBuilderX_plugins_uniapp_cli_node_modules_dcloudio_webpack_uni_mp_loader_lib_style_js_uni_transition_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0___default.a); 
+
+/***/ }),
+
+/***/ 383:
+/*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** ./node_modules/babel-loader/lib!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/webpack-preprocess-loader??ref--13-1!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/script.js!./node_modules/@dcloudio/vue-cli-plugin-uni/packages/vue-loader/lib??vue-loader-options!./node_modules/@dcloudio/webpack-uni-mp-loader/lib/style.js!D:/desktop/jiancaiPro/uni_modules/uni-transition/components/uni-transition/uni-transition.vue?vue&type=script&lang=js& ***!
+  \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ 18));
+var _typeof2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/typeof */ 13));
+var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ 11));
+var _createAnimation = __webpack_require__(/*! ./createAnimation */ 384);
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+var _default2 = {
+  name: 'uniTransition',
+  emits: ['click', 'change'],
+  props: {
+    show: {
+      type: Boolean,
+      default: false
+    },
+    modeClass: {
+      type: [Array, String],
+      default: function _default() {
+        return 'fade';
+      }
+    },
+    duration: {
+      type: Number,
+      default: 300
+    },
+    styles: {
+      type: Object,
+      default: function _default() {
+        return {};
+      }
+    },
+    customClass: {
+      type: String,
+      default: ''
+    },
+    onceRender: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data: function data() {
+    return {
+      isShow: false,
+      transform: '',
+      opacity: 1,
+      animationData: {},
+      durationTime: 300,
+      config: {}
+    };
+  },
+  watch: {
+    show: {
+      handler: function handler(newVal) {
+        if (newVal) {
+          this.open();
+        } else {
+          // 避免上来就执行 close,导致动画错乱
+          if (this.isShow) {
+            this.close();
+          }
+        }
+      },
+      immediate: true
+    }
+  },
+  computed: {
+    // 生成样式数据
+    stylesObject: function stylesObject() {
+      var styles = _objectSpread(_objectSpread({}, this.styles), {}, {
+        'transition-duration': this.duration / 1000 + 's'
+      });
+      var transform = '';
+      for (var i in styles) {
+        var line = this.toLine(i);
+        transform += line + ':' + styles[i] + ';';
+      }
+      return transform;
+    },
+    // 初始化动画条件
+    transformStyles: function transformStyles() {
+      return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject;
+    }
+  },
+  created: function created() {
+    // 动画默认配置
+    this.config = {
+      duration: this.duration,
+      timingFunction: 'ease',
+      transformOrigin: '50% 50%',
+      delay: 0
+    };
+    this.durationTime = this.duration;
+  },
+  methods: {
+    /**
+     *  ref 触发 初始化动画
+     */
+    init: function init() {
+      var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      if (obj.duration) {
+        this.durationTime = obj.duration;
+      }
+      this.animation = (0, _createAnimation.createAnimation)(Object.assign(this.config, obj), this);
+    },
+    /**
+     * 点击组件触发回调
+     */
+    onClick: function onClick() {
+      this.$emit('click', {
+        detail: this.isShow
+      });
+    },
+    /**
+     * ref 触发 动画分组
+     * @param {Object} obj
+     */
+    step: function step(obj) {
+      var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      if (!this.animation) return;
+      for (var i in obj) {
+        try {
+          if ((0, _typeof2.default)(obj[i]) === 'object') {
+            var _this$animation;
+            (_this$animation = this.animation)[i].apply(_this$animation, (0, _toConsumableArray2.default)(obj[i]));
+          } else {
+            this.animation[i](obj[i]);
+          }
+        } catch (e) {
+          console.error("\u65B9\u6CD5 ".concat(i, " \u4E0D\u5B58\u5728"));
+        }
+      }
+      this.animation.step(config);
+      return this;
+    },
+    /**
+     *  ref 触发 执行动画
+     */
+    run: function run(fn) {
+      if (!this.animation) return;
+      this.animation.run(fn);
+    },
+    // 开始过度动画
+    open: function open() {
+      var _this = this;
+      clearTimeout(this.timer);
+      this.transform = '';
+      this.isShow = true;
+      var _this$styleInit = this.styleInit(false),
+        opacity = _this$styleInit.opacity,
+        transform = _this$styleInit.transform;
+      if (typeof opacity !== 'undefined') {
+        this.opacity = opacity;
+      }
+      this.transform = transform;
+      // 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+      this.$nextTick(function () {
+        // TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+        _this.timer = setTimeout(function () {
+          _this.animation = (0, _createAnimation.createAnimation)(_this.config, _this);
+          _this.tranfromInit(false).step();
+          _this.animation.run();
+          _this.$emit('change', {
+            detail: _this.isShow
+          });
+        }, 20);
+      });
+    },
+    // 关闭过度动画
+    close: function close(type) {
+      var _this2 = this;
+      if (!this.animation) return;
+      this.tranfromInit(true).step().run(function () {
+        _this2.isShow = false;
+        _this2.animationData = null;
+        _this2.animation = null;
+        var _this2$styleInit = _this2.styleInit(false),
+          opacity = _this2$styleInit.opacity,
+          transform = _this2$styleInit.transform;
+        _this2.opacity = opacity || 1;
+        _this2.transform = transform;
+        _this2.$emit('change', {
+          detail: _this2.isShow
+        });
+      });
+    },
+    // 处理动画开始前的默认样式
+    styleInit: function styleInit(type) {
+      var _this3 = this;
+      var styles = {
+        transform: ''
+      };
+      var buildStyle = function buildStyle(type, mode) {
+        if (mode === 'fade') {
+          styles.opacity = _this3.animationType(type)[mode];
+        } else {
+          styles.transform += _this3.animationType(type)[mode] + ' ';
+        }
+      };
+      if (typeof this.modeClass === 'string') {
+        buildStyle(type, this.modeClass);
+      } else {
+        this.modeClass.forEach(function (mode) {
+          buildStyle(type, mode);
+        });
+      }
+      return styles;
+    },
+    // 处理内置组合动画
+    tranfromInit: function tranfromInit(type) {
+      var _this4 = this;
+      var buildTranfrom = function buildTranfrom(type, mode) {
+        var aniNum = null;
+        if (mode === 'fade') {
+          aniNum = type ? 0 : 1;
+        } else {
+          aniNum = type ? '-100%' : '0';
+          if (mode === 'zoom-in') {
+            aniNum = type ? 0.8 : 1;
+          }
+          if (mode === 'zoom-out') {
+            aniNum = type ? 1.2 : 1;
+          }
+          if (mode === 'slide-right') {
+            aniNum = type ? '100%' : '0';
+          }
+          if (mode === 'slide-bottom') {
+            aniNum = type ? '100%' : '0';
+          }
+        }
+        _this4.animation[_this4.animationMode()[mode]](aniNum);
+      };
+      if (typeof this.modeClass === 'string') {
+        buildTranfrom(type, this.modeClass);
+      } else {
+        this.modeClass.forEach(function (mode) {
+          buildTranfrom(type, mode);
+        });
+      }
+      return this.animation;
+    },
+    animationType: function animationType(type) {
+      return {
+        fade: type ? 1 : 0,
+        'slide-top': "translateY(".concat(type ? '0' : '-100%', ")"),
+        'slide-right': "translateX(".concat(type ? '0' : '100%', ")"),
+        'slide-bottom': "translateY(".concat(type ? '0' : '100%', ")"),
+        'slide-left': "translateX(".concat(type ? '0' : '-100%', ")"),
+        'zoom-in': "scaleX(".concat(type ? 1 : 0.8, ") scaleY(").concat(type ? 1 : 0.8, ")"),
+        'zoom-out': "scaleX(".concat(type ? 1 : 1.2, ") scaleY(").concat(type ? 1 : 1.2, ")")
+      };
+    },
+    // 内置动画类型与实际动画对应字典
+    animationMode: function animationMode() {
+      return {
+        fade: 'opacity',
+        'slide-top': 'translateY',
+        'slide-right': 'translateX',
+        'slide-bottom': 'translateY',
+        'slide-left': 'translateX',
+        'zoom-in': 'scale',
+        'zoom-out': 'scale'
+      };
+    },
+    // 驼峰转中横线
+    toLine: function toLine(name) {
+      return name.replace(/([A-Z])/g, '-$1').toLowerCase();
+    }
+  }
+};
+exports.default = _default2;
+
+/***/ })
+
+}]);
+//# sourceMappingURL=../../../../../.sourcemap/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js.map
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'uni_modules/uni-transition/components/uni-transition/uni-transition-create-component',
+    {
+        'uni_modules/uni-transition/components/uni-transition/uni-transition-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('2')['createComponent'](__webpack_require__(379))
+        })
+    },
+    [['uni_modules/uni-transition/components/uni-transition/uni-transition-create-component']]
+]);

unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.json

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

unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.wxml

@@ -0,0 +1 @@
+<block wx:if="{{isShow||onceRender}}"><view hidden="{{!(isShow)}}" class="{{['vue-ref',customClass]}}" style="{{(transformStyles)}}" animation="{{animationData}}" data-ref="ani" data-event-opts="{{[['tap',[['onClick',['$event']]]]]}}" bindtap="__e"><slot></slot></view></block>

utils/request/index.js

@@ -1,6 +1,6 @@
 uni.$u.http.setConfig((config) => {
 	if (process.env.NODE_ENV === 'development') {
-		config.baseURL = 'http://t16.9026.com/'
+		config.baseURL = 'http://t23.9026.com/index.php'
 	} else {
 		config.baseURL = 'http://jmapi.tangyuhao.cn/index.php'
 	}

utils/request/requestInterceptors.js

@@ -1,4 +1,6 @@
-import { getToken } from '../auth'
+import {
+	getToken
+} from '../auth'
 
 /**
  * 请求拦截
@@ -6,17 +8,17 @@ import { getToken } from '../auth'
  */
 // import store from '@/store'
 module.exports = vm => {
-	
-  uni.$u.http.interceptors.request.use(
-    config => { // 可使用async await 做异步操作
-      config.data = config.data || {}
-      if (getToken()) {
-        // config.header['Authorization'] = getToken()
-        config.header['Authorization'] = getToken()
-      }
-      return config
-    }, (config) => { // 可使用async await 做异步操作
-	console.log(config);
-      return Promise.reject(config)
-    })
-}
+
+	uni.$u.http.interceptors.request.use(
+		config => { // 可使用async await 做异步操作
+			config.data = config.data || {}
+			if (uni.getStorageSync('token')) {
+				// config.header['Authorization'] = getToken()
+				config.header['Authorization'] = uni.getStorageSync('token')
+			}
+			return config
+		}, (config) => { // 可使用async await 做异步操作
+			console.log(config);
+			return Promise.reject(config)
+		})
+}