12.27

main.js

@@ -16,6 +16,10 @@ Vue.prototype.$store = store
 
 Vue.prototype.$picBase = 'https://t18.9026.com/static/other/'
 Vue.prototype.$picBase2 = 'https://t18.9026.com/static/other/'
+Vue.prototype.$ossBaseUrl = 'https://zhengda.oss-cn-chengdu.aliyuncs.com/'
+
+Vue.prototype.$appId = 'wxa7481605ea99a9a0'
+Vue.prototype.$shareType = 0
 
 import uploadUrl from '@/common/config.js'
 // Vue.prototype.$picUrl = uploadUrl.picUrl

pages.json

@@ -133,6 +133,12 @@
 			"style": {
 				"navigationBarTitleText": "使用协议"
 			}
+		},
+		{
+			"path": "pages/index/filePre/index",
+			"style": {
+				"navigationBarTitleText": "图片预览"
+			}
 		}
 	],
 	"globalStyle": {

pages/index/filePre/index.scss

@@ -0,0 +1,43 @@
+	view {
+		box-sizing: border-box;
+	}
+ 
+	.container {
+		padding-bottom: 176rpx;
+		image{
+			 width: 100%;
+		}
+	}
+	
+	::v-deep .u-popup__content{
+		border-radius: 30rpx!important;
+	}
+	
+	.btnBox{
+		height: 176rpx;
+		background: #FFFFFF;
+		// background:red;
+		box-shadow: 0rpx -2rpx 20rpx 0rpx rgba(0,0,0,0.05);
+		border-radius: 32rpx 32rpx 0rpx 0rpx;
+		position: fixed;
+		bottom: 0;
+		width: 100%;
+		padding-left: 30rpx;
+		padding-right: 30rpx;
+		padding-top: 32rpx;
+		
+		z-index: 9999999999999999999999999999999;
+		.btn{
+			height: 96rpx;
+			background: linear-gradient(132deg, #0298FF 0%, #017AFF 100%);
+			box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,122,255,0.2);
+			border-radius: 54rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			font-size: 32rpx;
+			font-family: SourceHanSansCN, SourceHanSansCN;
+			font-weight: bold;
+			color: #FFFFFF;
+		}
+	}

pages/index/filePre/index.vue

@@ -0,0 +1,95 @@
+<template>
+	<view class="container">
+		<navBar title="图片预览" :back="true" color="#333333" background="#FFFFFF" />
+
+		<!-- <web-view :src="url1"></web-view> -->
+
+		<image :src="url1" mode="widthFix" show-menu-by-longpress></image>
+
+
+		<!-- <u-modal :show="show" title="温馨提示" confirmText="我知道了" content="" @confirm="confirm">
+			<view class="slot-content">
+				如要保存,请长按图片以保存至手机相册
+			</view>
+		</u-modal> -->
+
+		<view class="btnBox">
+			<view class="btn" @click="toSave">
+				保存到手机相册
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// import navBar from '@/components/navBar/index.vue'
+
+	// import {
+	// 	getKefu,
+	// } from '@/api/index/index.js'
+	export default {
+		// components: {
+		// 	navBar
+		// },
+		data() {
+			return {
+				url1: '',
+				show: false
+			}
+		},
+		onLoad(o) {
+			// this.getabout()
+			this.url1 = o.url
+			setTimeout(() => {
+				this.show = true
+			}, 1000)
+		},
+		methods: {
+			toSave() {
+				wx.showShareImageMenu({
+					path: this.url1,
+					success: (r) => {
+						console.log('r--------------', r);
+
+						uni.showToast({
+							title: '操作成功',
+							icon: 'success'
+						})
+					}
+				})
+
+				// wx.saveImageToPhotosAlbum({
+				// 	filePath: this.url1,
+				// 	success: (res) => {
+				// 		wx.showToast({
+				// 			title: '保存成功',
+				// 			icon: 'success'
+				// 		})
+				// 	}
+				// })
+			},
+
+			confirm() {
+				this.show = false
+			},
+			// async getabout() {
+			// 	let res1 = await getKefu()
+			// 	console.log('关于我们返回值--------2', res1);
+			// 	if (res1.code == 0) {
+			// 		this.content = res1.data.about.value
+			// 	} else {
+			// 		this.$toast(res1.message)
+			// 	}
+			// },
+			// toProtocol(type) {
+			// 	uni.navigateTo({
+			// 		url: '/pages/my/protocol/index?type=' + type
+			// 	})
+			// }
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "./index.scss";
+</style>

pages/index/genHuiBen/index.vue

@@ -63,7 +63,7 @@
 						</image>
 					</view>
 					<view class="item" @click="show2=true">
-						<input type="text" class="nackI" disabled v-model="formData.age" placeholder="选择年龄" />
+						<input type="text" class="nackI" disabled v-model="formData.ageName" placeholder="选择年龄" />
 						<image :src="picBase+'arrR2.png'" mode="heightFix" class="arrIcon">
 						</image>
 					</view>
@@ -73,7 +73,7 @@
 						</image>
 					</view>
 					<view class="item" @click="show4=true">
-						<input type="text" class="nackI" disabled v-model="formData.class" placeholder="选择年级" />
+						<input type="text" class="nackI" disabled v-model="formData.className" placeholder="选择年级" />
 						<image :src="picBase+'arrR2.png'" mode="heightFix" class="arrIcon">
 						</image>
 					</view>
@@ -137,9 +137,13 @@
 				formData: {
 					nickName: '',
 					sex: '',
-					age: '',
+
+					ageName: '',
+					age: -1,
 					star: '',
-					class: ''
+
+					className: '',
+					class: -1
 				},
 				show: false,
 				columns: [
@@ -173,7 +177,7 @@
 				],
 				show4: false,
 				columns4: [
-					['蒙大一', '蒙大二', '蒙小一', '蒙小二', '蒙小三']
+					['幼儿园', '一年级', '二年级', '三年级', '四年级', '五年级', '六年级']
 				],
 
 
@@ -183,18 +187,38 @@
 				],
 				roleId: -1,
 
-				diamond: 0
-
+				diamond: 0,
 
+				oldSeledRole: null
 			}
 		},
-		onLoad() {},
-		onShow() {
+		onLoad() {
 			this.getUserInfo()
 			this.getRoleparmas()
+			
+			this.reShow2()
+		},
+		onShow() {
+			if(getApp().refreshRole){
+				this.getRoleparmas()
+				getApp().refreshRole=null
+			}
+			
 		},
 		methods: {
-
+			reShow2(){
+				// 回显方式2
+				// this.formData.nickName = res1.data.data[i].name
+				this.formData.sex =this.columns[0][0]
+				
+				this.formData.age = 1 
+				this.formData.ageName ='1岁'
+				
+				this.formData.star =this.columns3[0][0]
+				
+				this.formData.className = this.columns4[0][0]
+				this.formData.class = 0
+			},
 			async getUserInfo() {
 				let res1 = await getUserInfo()
 				console.log('用户信息返回值--------', res1);
@@ -234,8 +258,7 @@
 					return
 				}
 
-				// console.log('fileList1',this.fileList1[0].url);
-				// return
+
 				if (this.fileList1.length == 0) {
 					return this.$toast('请上传图片')
 				}
@@ -245,16 +268,29 @@
 				if (!this.formData.sex) {
 					return this.$toast('请选择性别')
 				}
-				if (!this.formData.age) {
+				if (this.formData.age == -1) {
 					return this.$toast('请选择年龄')
 				}
 				if (!this.formData.star) {
 					return this.$toast('请选择星座')
 				}
-				if (!this.formData.class) {
+				if (this.formData.class == -1) {
 					return this.$toast('请选择班级')
 				}
 				let p = {}
+
+				// 判断用户是否修改了角色信息
+				if (this.oldSeledRole) {
+					if (this.oldSeledRole.name != this.formData.nickName || this.oldSeledRole.star != this.formData
+						.star || this.oldSeledRole.sex != this.formData
+						.sex || this.oldSeledRole.age != this.formData.age || this.oldSeledRole.level != this.formData
+						.class) {
+
+						console.log('用户修改了预置角色------------------');
+						this.roleId = -1
+					}
+				}
+				console.log('用户wei修改了预置角色------------------');
 				if (this.roleId != -1) {
 					p = {
 						roleId: this.roleId,
@@ -265,11 +301,13 @@
 						image: this.fileList1[0].url,
 						name: this.formData.nickName,
 						sex: this.formData.sex,
-						age: this.formData.age.slice(0, 1),
+						age: this.formData.age,
 						star: this.formData.star,
 						level: this.formData.class,
 					}
 				}
+
+				// return console.log('p----------------', p);
 				let res1 = await postTask(p)
 				console.log('生成任务提交返回值--------2', res1);
 				if (res1.code == 0) {
@@ -289,8 +327,34 @@
 				let res1 = await getRoleparmas()
 				console.log('角色列表返回值--------2', res1);
 				if (res1.code == 0) {
+					// res1.data.data = []
 					if (res1.data.data.length != 0) {
+						res1.data.data=res1.data.data.reverse()
+						
+						// 用于比对用户是否修改主角内容
+						// let i=res1.data.data.length-1
+						
 						this.columns5[0] = res1.data.data
+						
+						
+						
+						// 回显方式1
+						// let i=0
+						// this.oldSeledRole = res1.data.data[i]
+						// this.roleId = res1.data.data[i].id
+						// this.formData.nickName = res1.data.data[i].name
+						// this.formData.sex = res1.data.data[i].sex
+
+						// this.formData.age = res1.data.data[i].age
+						// this.formData.ageName = this.columns2[0][Number(res1.data.data[i].age) - 1]
+
+						// this.formData.star = res1.data.data[i].star
+
+						// this.formData.className = this.columns4[0][Number(res1.data.data[i].level)]
+						// this.formData.class = res1.data.data[i].level
+						
+					
+						
 					} else {
 						this.columns5[0] = ['暂无']
 					}
@@ -306,7 +370,8 @@
 			},
 			confirm2(e) {
 				console.log('e', e);
-				this.formData.age = e.value[0]
+				this.formData.ageName = this.columns2[0][e.indexs[0]]
+				this.formData.age = e.indexs[0] + 1
 				this.show2 = false
 			},
 			confirm3(e) {
@@ -316,7 +381,13 @@
 			},
 			confirm4(e) {
 				console.log('e', e);
-				this.formData.class = e.value[0]
+
+				// this.formData.class = e.value[0]
+
+				this.formData.class = e.indexs[0]
+				this.formData.className = e.value[0]
+
+				console.log('confirm4--level', this.formData.class);
 				this.show4 = false
 			},
 			confirm5(e) {
@@ -325,12 +396,22 @@
 					this.show5 = false
 					return
 				}
+				this.oldSeledRole = e.value[0]
 				console.log('e-----5', e.indexs[0], e.value[0]);
+
+
 				this.formData.class = e.value[0].level
+				this.formData.className = this.columns4[0][Number(e.value[0].level)]
+
+
 				this.formData.nickName = e.value[0].name
 				this.formData.sex = e.value[0].sex
 				this.formData.star = e.value[0].star
-				this.formData.age = e.value[0].age + '岁'
+
+
+				this.formData.age = e.value[0].age
+				this.formData.ageName = this.columns2[0][Number(e.value[0].age - 1)]
+
 
 				this.roleId = e.value[0].id
 				this.show5 = false

pages/index/genRes/index.scss

@@ -58,16 +58,44 @@
 			// overflow: hidden;
 			position: relative;
 			 // overflow: auto; /* 清除float的影响 */
-
+			 
+			 .loading{
+				 position: absolute;
+				 top: 0;
+				 left: 0;
+				 width: 100%;
+				 // height: 100%;
+				 
+				 display: flex;
+				align-items: center;
+				justify-content: space-around;
+				flex-direction: column;
 				 .loadingImg{
-				 	position: absolute;
-				 	top: 150rpx;
-				 	left: 50%;
+					 
+					 margin-top: 50rpx;
+				 	// position: absolute;
+				 	// top: 150rpx;
+				 	// left: 50%;
 				 	width: 500rpx;
 				 	height: 500rpx;
-					transform: translate(-50%,0%);
+				 	// 				transform: translate(-50%,0%);
+					
+					
 					
+				 					
 				 }
+				.progress{
+					 width: 100%;
+					 
+					 margin-top: 100rpx;
+					 .tipTxt{
+						 margin-top: 50rpx;
+						 color: #017AFF;
+					 }
+				 }
+			 }
+
+				 
 			
 				 text{
 					 font-size: 28rpx;
@@ -156,5 +184,22 @@
 		}
 	}
 	
+	::v-deep .u-popup__content{
+		border-radius: 30rpx!important;
+	}
+	
+	.slot-content{
+		
+		// font-size: 28rpx;
+		.txt1{
+			margin-bottom: 10rpx;
+		}
+		.caidan{
+			width: 100%;
+			height: 30rpx;
+			margin-top: 10rpx;
+		}
+	}
+	
 	
 		

pages/index/genRes/index.vue

@@ -7,18 +7,28 @@
 
 			<view class="contentBox">
 				<view class="bgTag" :style="{'background-image':`url(${picBase+'resBg.png'})`}">
-					{{huibenRes.title?huibenRes.title:'内容生成中...'}}
+					{{huibenRes.title&&!showLoading?huibenRes.title:'内容生成中...'}}
 				</view>
 				<view class="storeBox">
+					<view class="loading" v-if="showLoading">
+						<!-- <view class="loading" :style="{display:!showLoading?'none':''}"> -->
+						<image class="loadingImg" mode="widthFix" :src="picBase+'loading.gif'">
+						</image>
 
-					<image class="loadingImg" mode="widthFix" :src="picBase+'loading.gif'" v-if="showLoading">
-					</image>
 
 
-					<u-parse :content="huibenRes.pinyin_content" @ready="loaded"></u-parse>
-					<!-- <u-parse :content="huibenRes.pinyin_content" @load="loaded"></u-parse> -->
+						<view class="progress" v-if="taskId!=-1">
+							<!-- <view class="progress"> -->
+							<u-line-progress :percentage="percentage" activeColor="#017AFF"></u-line-progress>
+
+							<view class="tipTxt">
+								生成大约需要1分钟，请不要离开....
+							</view>
+						</view>
+					</view>
 
-					<!-- <u-parse :content="content"></u-parse> -->
+
+					<u-parse :content="huibenRes.pinyin_content" @ready="loaded"></u-parse>
 				</view>
 
 			</view>
@@ -26,12 +36,24 @@
 
 		<view class="btnBox">
 			<view class="btn b1" @click="downPdf">
-				下载PDF
+				生成PDF
 			</view>
 			<view class="btn b2" @click="downPic">
-				下载图片
+				生成图片
 			</view>
 		</view>
+		
+		
+		<u-modal :show="showLead" title="PDF下载提示" confirmText="去预览" content="" @confirm="prePdf">
+			<view class="slot-content">
+				<view class="txt1">
+					下载PDF,请先点击预览页面右上角...菜单按钮,如图1:
+				</view>
+				<image src="../../../static/other/caidan.jpg" mode="widthFix" class="caidan"></image>
+			,再点击弹框中的保存到手机按钮，如图2：
+			<image src="../../../static/other/caidan_s.jpg" mode="widthFix" class="caidan"></image>
+			</view>
+		</u-modal>
 	</view>
 </template>
 
@@ -54,9 +76,16 @@
 				huibenRes: null,
 				showLoading: true,
 				timer: null,
+				timer1: null,
 				content: '',
 
-				huibenDetail: null
+				huibenDetail: null,
+
+				percentage: 0,
+				
+				
+				tempPdfile:'',
+				showLead:false
 			}
 		},
 		onLoad(o) {
@@ -70,10 +99,18 @@
 
 				this.timer = setInterval(() => {
 					this.getGenRes()
-				}, 2000)
+				}, 1000)
 			}
 
 			if (getApp().huibenDetail) {
+				this.timer1 = setInterval(() => {
+					if (this.percentage <= 50) {
+						this.percentage = this.percentage + 25
+
+						console.log('this.percentage', this.percentage);
+					}
+				}, 1000)
+
 				// this.showLoading = false
 				// this.huibenDetail = getApp().huibenDetail
 
@@ -90,11 +127,31 @@
 
 		},
 		methods: {
+			prePdf(){
+				this.showLead=false
+				uni.openDocument({
+					filePath: this.tempPdfile,
+					showMenu: true, //是否可以分享
+					success: (res) => {
+						uni.hideLoading()
+						console.log(res);
+					},
+					fail: (e) => {
+						uni.showToast({
+							title: '打开失败',
+							icon: "error"
+						})
+					}
+				})
+			},
 
 			downPic() {
 				if (!uni.getStorageSync('token')) {
 					return this.$toast('请登录后操作')
 				}
+				uni.showLoading({
+					title: '生成中'
+				});
 				console.log('img-path', this.huibenRes.image_path);
 				// this.pictureReview(this.huibenRes.image_path)
 				this.download(this.huibenRes.image_path, 2)
@@ -115,6 +172,8 @@
 				});
 			},
 			loaded() {
+				clearInterval(this.timer1)
+				this.percentage = 100
 				this.showLoading = false
 				console.log('loaded()------');
 			},
@@ -122,6 +181,9 @@
 				if (!uni.getStorageSync('token')) {
 					return this.$toast('请登录后操作')
 				}
+				uni.showLoading({
+					title: '生成中'
+				});
 				console.log('downPdf-------------', {
 					id: this.taskId != -1 ? this.taskId : this.huibenRes.id
 					// id: 4
@@ -143,9 +205,7 @@
 
 			download(file, type) {
 				let _this = this
-				uni.showLoading({
-					title: '下载中'
-				});
+				
 				//下载文件
 				uni.downloadFile({ //只能是GET请求
 					url: file, //请求地址(后台返回的码流地址)
@@ -157,29 +217,23 @@
 
 							if (type == 2) {
 								uni.hideLoading()
-								return _this.pictureReview(tempFile)
+								// return _this.pictureReview(tempFile)
+								return uni.navigateTo({
+									url: '/pages/index/filePre/index?url=' + tempFile
+								})
+
 							}
+							
 							//保存成功之后 打开文件
 							uni.getFileSystemManager().saveFile({
 								tempFilePath: tempFile,
-								// filePath: wx.env.USER_DATA_PATH + '/' + '上传成员.pdf',//自定义文件名
+								filePath: wx.env.USER_DATA_PATH + '/' + this.huibenRes.title+'.pdf',//自定义文件名
 								success(res) {
 									console.log(res)
-									uni.openDocument({
-										filePath: res.savedFilePath,
-										showMenu: true, //是否可以分享
-										success: (res) => {
-											uni.hideLoading()
-											console.log(res);
-										},
-										fail: (e) => {
-											uni.showToast({
-												title: '打开失败',
-												icon: "error"
-											})
-										}
-									})
-
+									uni.hideLoading()
+									
+									_this.tempPdfile=res.savedFilePath
+									_this.showLead=true
 								}
 							})
 						}
@@ -197,6 +251,7 @@
 			},
 
 			onBack() {
+				getApp().refreshRole=true
 
 				console.log('onBack()-----------');
 				if (this.timer) {
@@ -209,11 +264,24 @@
 				})
 				console.log('查询生成结果返回值--------2', res1);
 				if (res1.code == 0) {
-
-					if (res1.data.state == 6) {
+					if (res1.data.state == 0) {
+						this.percentage = 10
+					} else if (res1.data.state == 1) {
+						this.percentage = 16
+					} else if (res1.data.state == 2) {
+						this.percentage = 32
+					} else if (res1.data.state == 3) {
+						this.percentage = 48
+					} else if (res1.data.state == 4) {
+						this.percentage = 64
+					} else if (res1.data.state == 5) {
+						this.percentage = 80
+					} else if (res1.data.state == 6) {
 						this.huibenRes = res1.data
 						this.content = `${res1.data.pinyin_content}`
-						this.showLoading = false
+
+						this.percentage = 99
+						// this.showLoading = false
 						clearInterval(this.timer)
 					}
 					// this.chargeList=[]

pages/index/index.scss

@@ -163,4 +163,9 @@
 			}
 		}
 	}
-}
+}
+
+::v-deep .u-swiper{
+	border-radius: 0!important;
+}
+

pages/index/index.vue

@@ -4,8 +4,7 @@
 
 		<!-- 轮播图 -->
 		<view class="swiperBox">
-			<u-swiper height="514rpx" imgMode="heightFix" :autoplay="false" :list="list1" @change="change"
-				@click="click">
+			<u-swiper height="514rpx" imgMode="aspectFill" :autoplay="false" :list="list1" @click="" circular>
 			</u-swiper>
 		</view>
 
@@ -101,9 +100,9 @@
 				urlTitle: '',
 
 				list1: [
-					'https://cdn.uviewui.com/uview/swiper/swiper1.png',
-					'https://cdn.uviewui.com/uview/swiper/swiper2.png',
-					'https://cdn.uviewui.com/uview/swiper/swiper3.png',
+					// 'https://cdn.uviewui.com/uview/swiper/swiper1.png',
+					// 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+					// 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
 				],
 
 				tabBarList: [{
@@ -192,10 +191,10 @@
 					let tempList = []
 
 					res1.data.forEach((item, index) => {
-						tempList.push(uploadUrl.baseUrl + '/' + item.image_path)
+						tempList.push(item.image_path)
 					})
 
-					// this.list1 = tempList
+					this.list1 = tempList
 					console.log('list1', this.list1);
 				} else {
 					this.$toast(res1.message)

pages/my/cash/index.vue

@@ -71,15 +71,18 @@
 						<view class='item' @click="toCashRecord">
 							提现记录
 						</view>
-						<!-- <view class='item'>
-							收取提现金额的{{tipInfo.percent}}手续费
+
+						<view class='item' style="color:black;margin-top: 10rpx;">
+							单次最低提现金额为{{min}}元
+						</view>
+						<view class='item' style="color:black;">
+							收取提现金额的{{Ratio}}%手续费
 						</view>
-						<view class='item'>
+						<view class='item' style="color:black;">
 							如有疑问，请及时联系客服
-						</view> -->
+						</view>
 					</view>
 				</view>
-
 			</view>
 		</view>
 		<u-picker :show="showPopup" :columns="wayList" title="提现方式" aColor="#007AFF" :defaultIndex="currWayIndex"
@@ -99,7 +102,8 @@
 
 	import {
 		userWithdraw,
-		getYongjinList
+		getYongjinList,
+		getPosterBg
 	} from '@/api/index/index.js'
 	export default {
 		// components: {
@@ -126,6 +130,10 @@
 					bankName: ''
 				},
 				showPopup: false,
+
+				Ratio: 0,
+				min: 0
+
 			}
 		},
 		onLoad(o) {
@@ -133,9 +141,35 @@
 			// this.availMoney = Number(o.availMoney || 0)
 			// console.log('传递过来的可提现余额', o.availMoney)
 			// }
+			this.getCashTip()
+		},
+		onShow() {
 			this.getYongjinList()
 		},
 		methods: {
+			async getCashTip() {
+				let res1 = await getPosterBg({
+					key: 'withdraw'
+				})
+				console.log('提现提示返回值--------1', res1);
+				if (res1.code == 0) {
+					this.Ratio = res1.data.value
+				} else {
+					this.$toast(res1.message)
+				}
+
+				let res2 = await getPosterBg({
+					key: 'withdraw_min'
+				})
+				console.log('提现提示返回值--------2', res2);
+				if (res2.code == 0) {
+					this.min = res2.data.value
+				} else {
+					this.$toast(res2.message)
+				}
+			},
+
+
 			async getYongjinList() {
 				let res1 = await getYongjinList()
 				console.log('佣金明细返回值--------', res1);
@@ -158,14 +192,12 @@
 						title: '请输入提现金额',
 						icon: 'none'
 					})
-				}
-				// else if (Number(this.formData.money) < Number(this.tipInfo.minAmount.slice(0, -1)) ) {
-				//     return wx.showToast({
-				//       title: '单次最低提现金额为' + this.tipInfo.minAmount,
-				//       icon: 'none'
-				//     })
-				//   } 
-				else if (!this.formData.name) {
+				} else if (Number(this.formData.money) < Number(this.min)) {
+					return wx.showToast({
+						title: '单次最低提现金额为' + this.min,
+						icon: 'none'
+					})
+				} else if (!this.formData.name) {
 					return wx.showToast({
 						title: '请输入名字',
 						icon: 'none'
@@ -215,7 +247,7 @@
 				if (res1.code == 0) {
 					this.$toast('提交成功', 'success')
 					setTimeout(() => {
-						uni.navigateTo({
+						uni.redirectTo({
 							url: '/pages/my/cashRecord/index'
 						})
 					}, 1500)

pages/my/index.vue

@@ -217,9 +217,17 @@
 					if (!uni.getStorageSync('token')) {
 						return this.$toast('请登录后操作')
 					}
-					uni.navigateTo({
-						url: '/pages/my/pubCenter/index'
-					})
+
+					if (this.userInfo.is_share == 0) {
+						uni.navigateTo({
+							url: '/pages/my/jiangli/index'
+						})
+					} else {
+						uni.navigateTo({
+							url: '/pages/my/pubCenter/index'
+						})
+					}
+
 				} else if (i == 1) {
 					if (!uni.getStorageSync('token')) {
 						return this.$toast('请登录后操作')

pages/my/jiangli/index.vue

@@ -76,9 +76,12 @@
 			</view>
 		</view>
 		<view class="btnBox">
-			<view class="btn" @click="toTuijian">
+			<!-- <view class="btn" @click="toTuijian">
 				立即推荐
-			</view>
+			</view> -->
+			<button open-type="share" class="btn">
+				立即推荐
+			</button>
 		</view>
 	</view>
 </template>
@@ -86,6 +89,7 @@
 <script>
 	import {
 		getTuijian,
+		getPosterBg
 	} from '@/api/index/index.js'
 	// import navBar from '@/components/navBar/index.vue'
 	export default {
@@ -98,16 +102,60 @@
 				jiangli: {
 					data: []
 				},
+				shareTitle: null,
+
+				shareImg: ''
 			}
 		},
 		onLoad() {
 			this.getTuijian()
+			this.getShare()
+
+		},
+		onShareAppMessage(params) {
+			if (params.from === 'button' || params.from === 'menu') {
+				return {
+					title: this.shareTitle,
+					imageUrl: this.$ossBaseUrl + this.shareImg,
+					path: '/pages/index/index?scene=' + uni.getStorageSync('userInfo').id || '',
+					mpId: this.$appId,
+					type: this.$shareType,
+				}
+			}
 		},
 		methods: {
-			toTuijian() {
-				uni.navigateTo({
-					url: '/pages/my/tuiguangDashi/index'
+			async getShare() {
+				let res1 = await getPosterBg({
+					key: 'share_title'
+				})
+				console.log('分享信息返回值--------1', res1);
+				if (res1.code == 0) {
+					this.shareTitle = res1.data.value
+				} else {
+					this.$toast(res1.message)
+				}
+
+				let res2 = await getPosterBg({
+					key: 'share_image'
 				})
+				console.log('分享信息返回值--------2', res2);
+				if (res2.code == 0) {
+					this.shareImg = res2.data.value
+				} else {
+					this.$toast(res2.message)
+				}
+
+				// 
+			},
+
+
+			toTuijian() {
+
+
+
+				// uni.navigateTo({
+				// 	url: '/pages/my/tuiguangDashi/index'
+				// })
 			},
 			async getTuijian() {
 				let res1 = await getTuijian()

pages/my/pubCenter/index.vue

@@ -106,7 +106,6 @@
 		},
 		onLoad() {
 			this.getUserInfo()
-			this.getYongjinList()
 
 			//获取手机系统信息 -- 状态栏高度
 			let {
@@ -116,6 +115,10 @@
 			this.statusBarHeight = statusBarHeight
 			this.windowWidth = windowWidth
 		},
+
+		onShow() {
+			this.getYongjinList()
+		},
 		methods: {
 
 			async getYongjinList() {

pages/my/tuiguangHaibao/index.vue

@@ -101,9 +101,10 @@
 					poster_bg_height: "1100",
 					poster_bg_img: "1671",
 
-					poster_qrcode_x: "502",
-					poster_qrcode_y: "865",
-					poster_qrcode_width: "175",
+					poster_qrcode_x: "270",
+					poster_qrcode_y: "858",
+
+					poster_qrcode_width: "160",
 
 
 
@@ -144,13 +145,14 @@
 
 			async getPosterBg() {
 				let res1 = await getPosterBg({
-					key: 'share_title'
+					key: 'promotion_background'
 				})
-				console.log('海报背景图返回值--------2', res1);
+				console.log('海报背景图返回值--------2', res1, this.$ossBaseUrl + res1.data.value);
 				if (res1.code == 0) {
 					// this.qrcode = res1.data.url
 
-					this.info.poster_bg_img_path = this.$picBase2 + "haibao_bg.png"
+					// this.info.poster_bg_img_path = this.$picBase2 + "haibao_bg.png"
+					this.info.poster_bg_img_path = this.$ossBaseUrl + res1.data.value
 
 					this.createPoster()
 				} else {
@@ -167,16 +169,43 @@
 					fileType: 'jpg',
 					quality: 1,
 					success: res => {
+						// wx.saveImageToPhotosAlbum({
+						// 	filePath: res.tempFilePath,
+						// 	success: (res) => {
+						// 		wx.showToast({
+						// 			title: '保存成功',
+						// 			icon: 'success'
+						// 		})
+						// 	}
+						// })
+
+
+
+
 						// #ifdef MP-WEIXIN
 						wx.showShareImageMenu({
-							path: res.tempFilePath
+							path: res.tempFilePath,
+							success: (r) => {
+								console.log('r--------------', r);
+
+								uni.showToast({
+									title: '操作成功',
+									icon: 'success'
+								})
+							}
 						})
+
 						// this.showPoster = false;
 						uni.hideLoading();
 						// #endif
 					}
 				});
 			},
+
+
+
+
+
 			getdownload(e) {
 				return new Promise((resolve, reject) => {
 					uni.request({

pages/my/yongjinDetail/index.vue

@@ -113,6 +113,8 @@
 		},
 		onLoad() {
 			this.getUserInfo()
+		},
+		onShow() {
 			this.getYongjinList()
 		},
 		methods: {

unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/filePre/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/my/filePre/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/my/filePre/index.vue'\ncreatePage(Page)"],"sourceRoot":""}

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

@@ -21,7 +21,8 @@
     "pages/my/myRecord/index",
     "pages/my/kefu/index",
     "pages/my/aboutUs/index",
-    "pages/my/protocol/index"
+    "pages/my/protocol/index",
+    "pages/index/filePre/index"
   ],
   "subPackages": [],
   "window": {

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

@@ -24,12 +24,12 @@ 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 */ 347));
+    return resolve(__webpack_require__(/*! @/components/navBar/index.vue */ 355));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var tabBar = function tabBar() {
   __webpack_require__.e(/*! require.ensure | components/tabBar/index */ "components/tabBar/index").then((function () {
-    return resolve(__webpack_require__(/*! @/components/tabBar/index.vue */ 354));
+    return resolve(__webpack_require__(/*! @/components/tabBar/index.vue */ 362));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component('navBar', navBar);
@@ -38,6 +38,9 @@ _vue.default.use(_uviewUi.default);
 _vue.default.prototype.$store = _index.default;
 _vue.default.prototype.$picBase = 'https://t18.9026.com/static/other/';
 _vue.default.prototype.$picBase2 = 'https://t18.9026.com/static/other/';
+_vue.default.prototype.$ossBaseUrl = 'https://zhengda.oss-cn-chengdu.aliyuncs.com/';
+_vue.default.prototype.$appId = 'wxa7481605ea99a9a0';
+_vue.default.prototype.$shareType = 0;
 // Vue.prototype.$picUrl = uploadUrl.picUrl
 // Vue.prototype.$picBase = uploadUrl.picBase
 

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

@@ -780,8 +780,8 @@ function populateParameters(result) {
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "3.98",
-    uniRuntimeVersion: "3.98",
+    uniCompileVersion: "3.99",
+    uniRuntimeVersion: "3.99",
     uniPlatform: undefined || "mp-weixin",
     deviceBrand: deviceBrand,
     deviceModel: model,
@@ -22321,7 +22321,15 @@ module.exports = QQMapWX;
 /* 363 */,
 /* 364 */,
 /* 365 */,
-/* 366 */
+/* 366 */,
+/* 367 */,
+/* 368 */,
+/* 369 */,
+/* 370 */,
+/* 371 */,
+/* 372 */,
+/* 373 */,
+/* 374 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-swiper/props.js ***!
   \******************************************************************************/
@@ -22464,14 +22472,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 367 */,
-/* 368 */,
-/* 369 */,
-/* 370 */,
-/* 371 */,
-/* 372 */,
-/* 373 */,
-/* 374 */
+/* 375 */,
+/* 376 */,
+/* 377 */,
+/* 378 */,
+/* 379 */,
+/* 380 */,
+/* 381 */,
+/* 382 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-empty/props.js ***!
   \*****************************************************************************/
@@ -22548,14 +22556,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 375 */,
-/* 376 */,
-/* 377 */,
-/* 378 */,
-/* 379 */,
-/* 380 */,
-/* 381 */,
-/* 382 */
+/* 383 */,
+/* 384 */,
+/* 385 */,
+/* 386 */,
+/* 387 */,
+/* 388 */,
+/* 389 */,
+/* 390 */
 /*!********************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-loadmore/props.js ***!
   \********************************************************************************/
@@ -22667,21 +22675,21 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 383 */,
-/* 384 */,
-/* 385 */,
-/* 386 */,
-/* 387 */,
-/* 388 */,
-/* 389 */,
-/* 390 */,
 /* 391 */,
 /* 392 */,
 /* 393 */,
 /* 394 */,
 /* 395 */,
 /* 396 */,
-/* 397 */
+/* 397 */,
+/* 398 */,
+/* 399 */,
+/* 400 */,
+/* 401 */,
+/* 402 */,
+/* 403 */,
+/* 404 */,
+/* 405 */
 /*!**********************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/libs/mixin/button.js ***!
   \**********************************************************************/
@@ -22711,7 +22719,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 398 */
+/* 406 */
 /*!************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/libs/mixin/openType.js ***!
   \************************************************************************/
@@ -22753,7 +22761,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 399 */
+/* 407 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-button/props.js ***!
   \******************************************************************************/
@@ -22932,14 +22940,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 400 */,
-/* 401 */,
-/* 402 */,
-/* 403 */,
-/* 404 */,
-/* 405 */,
-/* 406 */,
-/* 407 */
+/* 408 */,
+/* 409 */,
+/* 410 */,
+/* 411 */,
+/* 412 */,
+/* 413 */,
+/* 414 */,
+/* 415 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-upload/utils.js ***!
   \******************************************************************************/
@@ -23083,7 +23091,7 @@ function chooseFile(_ref) {
 /* 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"]))
 
 /***/ }),
-/* 408 */
+/* 416 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-upload/mixin.js ***!
   \******************************************************************************/
@@ -23110,7 +23118,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 409 */
+/* 417 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-upload/props.js ***!
   \******************************************************************************/
@@ -23252,14 +23260,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 410 */,
-/* 411 */,
-/* 412 */,
-/* 413 */,
-/* 414 */,
-/* 415 */,
-/* 416 */,
-/* 417 */
+/* 418 */,
+/* 419 */,
+/* 420 */,
+/* 421 */,
+/* 422 */,
+/* 423 */,
+/* 424 */,
+/* 425 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-picker/props.js ***!
   \******************************************************************************/
@@ -23364,14 +23372,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 418 */,
-/* 419 */,
-/* 420 */,
-/* 421 */,
-/* 422 */,
-/* 423 */,
-/* 424 */,
-/* 425 */
+/* 426 */,
+/* 427 */,
+/* 428 */,
+/* 429 */,
+/* 430 */,
+/* 431 */,
+/* 432 */,
+/* 433 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-parse/props.js ***!
   \*****************************************************************************/
@@ -23431,7 +23439,7 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 426 */
+/* 434 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-parse/parser.js ***!
   \******************************************************************************/
@@ -24362,14 +24370,14 @@ module.exports = parser;
 /* 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"]))
 
 /***/ }),
-/* 427 */,
-/* 428 */,
-/* 429 */,
-/* 430 */,
-/* 431 */,
-/* 432 */,
-/* 433 */,
-/* 434 */
+/* 435 */,
+/* 436 */,
+/* 437 */,
+/* 438 */,
+/* 439 */,
+/* 440 */,
+/* 441 */,
+/* 442 */
 /*!****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-icon/icons.js ***!
   \****************************************************************************/
@@ -24600,7 +24608,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 435 */
+/* 443 */
 /*!****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-icon/props.js ***!
   \****************************************************************************/
@@ -24707,14 +24715,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 436 */,
-/* 437 */,
-/* 438 */,
-/* 439 */,
-/* 440 */,
-/* 441 */,
-/* 442 */,
-/* 443 */
+/* 444 */,
+/* 445 */,
+/* 446 */,
+/* 447 */,
+/* 448 */,
+/* 449 */,
+/* 450 */,
+/* 451 */
 /*!***********************************************************************!*\
   !*** D:/desktop/huibenPro/components/wike-painter/common/relation.js ***!
   \***********************************************************************/
@@ -24881,7 +24889,7 @@ function children(parent) {
 }
 
 /***/ }),
-/* 444 */
+/* 452 */
 /*!*************************************************************!*\
   !*** D:/desktop/huibenPro/components/wike-painter/props.js ***!
   \*************************************************************/
@@ -24937,7 +24945,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 445 */
+/* 453 */
 /*!*************************************************************!*\
   !*** D:/desktop/huibenPro/components/wike-painter/utils.js ***!
   \*************************************************************/
@@ -25214,7 +25222,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"]))
 
 /***/ }),
-/* 446 */
+/* 454 */
 /*!***************************************************************!*\
   !*** D:/desktop/huibenPro/components/wike-painter/painter.js ***!
   \***************************************************************/
@@ -27299,14 +27307,14 @@ 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"]))
 
 /***/ }),
-/* 447 */,
-/* 448 */,
-/* 449 */,
-/* 450 */,
-/* 451 */,
-/* 452 */,
-/* 453 */,
-/* 454 */
+/* 455 */,
+/* 456 */,
+/* 457 */,
+/* 458 */,
+/* 459 */,
+/* 460 */,
+/* 461 */,
+/* 462 */
 /*!****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-tabs/props.js ***!
   \****************************************************************************/
@@ -27388,14 +27396,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 455 */,
-/* 456 */,
-/* 457 */,
-/* 458 */,
-/* 459 */,
-/* 460 */,
-/* 461 */,
-/* 462 */
+/* 463 */,
+/* 464 */,
+/* 465 */,
+/* 466 */,
+/* 467 */,
+/* 468 */,
+/* 469 */,
+/* 470 */
 /*!********************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uni-icons/components/uni-icons/icons.js ***!
   \********************************************************************************/
@@ -28416,14 +28424,14 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 463 */,
-/* 464 */,
-/* 465 */,
-/* 466 */,
-/* 467 */,
-/* 468 */,
-/* 469 */,
-/* 470 */
+/* 471 */,
+/* 472 */,
+/* 473 */,
+/* 474 */,
+/* 475 */,
+/* 476 */,
+/* 477 */,
+/* 478 */
 /*!************************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-loading-icon/props.js ***!
   \************************************************************************************/
@@ -28500,14 +28508,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 471 */,
-/* 472 */,
-/* 473 */,
-/* 474 */,
-/* 475 */,
-/* 476 */,
-/* 477 */,
-/* 478 */
+/* 479 */,
+/* 480 */,
+/* 481 */,
+/* 482 */,
+/* 483 */,
+/* 484 */,
+/* 485 */,
+/* 486 */
 /*!****************************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-swiper-indicator/props.js ***!
   \****************************************************************************************/
@@ -28554,14 +28562,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 479 */,
-/* 480 */,
-/* 481 */,
-/* 482 */,
-/* 483 */,
-/* 484 */,
-/* 485 */,
-/* 486 */
+/* 487 */,
+/* 488 */,
+/* 489 */,
+/* 490 */,
+/* 491 */,
+/* 492 */,
+/* 493 */,
+/* 494 */
 /*!****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-line/props.js ***!
   \****************************************************************************/
@@ -28612,14 +28620,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 487 */,
-/* 488 */,
-/* 489 */,
-/* 490 */,
-/* 491 */,
-/* 492 */,
-/* 493 */,
-/* 494 */
+/* 495 */,
+/* 496 */,
+/* 497 */,
+/* 498 */,
+/* 499 */,
+/* 500 */,
+/* 501 */,
+/* 502 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-popup/props.js ***!
   \*****************************************************************************/
@@ -28716,14 +28724,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 495 */,
-/* 496 */,
-/* 497 */,
-/* 498 */,
-/* 499 */,
-/* 500 */,
-/* 501 */,
-/* 502 */
+/* 503 */,
+/* 504 */,
+/* 505 */,
+/* 506 */,
+/* 507 */,
+/* 508 */,
+/* 509 */,
+/* 510 */
 /*!*******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-toolbar/props.js ***!
   \*******************************************************************************/
@@ -28775,14 +28783,6 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 503 */,
-/* 504 */,
-/* 505 */,
-/* 506 */,
-/* 507 */,
-/* 508 */,
-/* 509 */,
-/* 510 */,
 /* 511 */,
 /* 512 */,
 /* 513 */,
@@ -28791,7 +28791,15 @@ exports.default = _default;
 /* 516 */,
 /* 517 */,
 /* 518 */,
-/* 519 */
+/* 519 */,
+/* 520 */,
+/* 521 */,
+/* 522 */,
+/* 523 */,
+/* 524 */,
+/* 525 */,
+/* 526 */,
+/* 527 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-badge/props.js ***!
   \*****************************************************************************/
@@ -28881,14 +28889,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 520 */,
-/* 521 */,
-/* 522 */,
-/* 523 */,
-/* 524 */,
-/* 525 */,
-/* 526 */,
-/* 527 */
+/* 528 */,
+/* 529 */,
+/* 530 */,
+/* 531 */,
+/* 532 */,
+/* 533 */,
+/* 534 */,
+/* 535 */
 /*!*******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-overlay/props.js ***!
   \*******************************************************************************/
@@ -28930,14 +28938,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 528 */,
-/* 529 */,
-/* 530 */,
-/* 531 */,
-/* 532 */,
-/* 533 */,
-/* 534 */,
-/* 535 */
+/* 536 */,
+/* 537 */,
+/* 538 */,
+/* 539 */,
+/* 540 */,
+/* 541 */,
+/* 542 */,
+/* 543 */
 /*!**********************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-transition/props.js ***!
   \**********************************************************************************/
@@ -28979,7 +28987,7 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 536 */
+/* 544 */
 /*!***************************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-transition/transition.js ***!
   \***************************************************************************************/
@@ -28996,7 +29004,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 */ 537));
+var _nvueAniMap = _interopRequireDefault(__webpack_require__(/*! ./nvue.ani-map.js */ 545));
 // 定义一个一定时间后自动成功的promise，让调用nextTick方法处，进入下一个then方法
 var nextTick = function nextTick() {
   return new Promise(function (resolve) {
@@ -29088,7 +29096,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 537 */
+/* 545 */
 /*!*****************************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-transition/nvue.ani-map.js ***!
   \*****************************************************************************************/
@@ -29281,14 +29289,14 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 538 */,
-/* 539 */,
-/* 540 */,
-/* 541 */,
-/* 542 */,
-/* 543 */,
-/* 544 */,
-/* 545 */
+/* 546 */,
+/* 547 */,
+/* 548 */,
+/* 549 */,
+/* 550 */,
+/* 551 */,
+/* 552 */,
+/* 553 */
 /*!**********************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-status-bar/props.js ***!
   \**********************************************************************************/
@@ -29314,14 +29322,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 546 */,
-/* 547 */,
-/* 548 */,
-/* 549 */,
-/* 550 */,
-/* 551 */,
-/* 552 */,
-/* 553 */
+/* 554 */,
+/* 555 */,
+/* 556 */,
+/* 557 */,
+/* 558 */,
+/* 559 */,
+/* 560 */,
+/* 561 */
 /*!***********************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-safe-bottom/props.js ***!
   \***********************************************************************************/
@@ -29340,6 +29348,218 @@ var _default = {
 };
 exports.default = _default;
 
+/***/ }),
+/* 562 */,
+/* 563 */,
+/* 564 */,
+/* 565 */,
+/* 566 */,
+/* 567 */,
+/* 568 */,
+/* 569 */,
+/* 570 */,
+/* 571 */,
+/* 572 */,
+/* 573 */,
+/* 574 */,
+/* 575 */,
+/* 576 */,
+/* 577 */,
+/* 578 */,
+/* 579 */,
+/* 580 */,
+/* 581 */,
+/* 582 */,
+/* 583 */,
+/* 584 */,
+/* 585 */,
+/* 586 */,
+/* 587 */,
+/* 588 */,
+/* 589 */,
+/* 590 */,
+/* 591 */,
+/* 592 */,
+/* 593 */,
+/* 594 */,
+/* 595 */,
+/* 596 */,
+/* 597 */,
+/* 598 */,
+/* 599 */,
+/* 600 */,
+/* 601 */,
+/* 602 */,
+/* 603 */,
+/* 604 */,
+/* 605 */,
+/* 606 */,
+/* 607 */,
+/* 608 */,
+/* 609 */,
+/* 610 */,
+/* 611 */,
+/* 612 */,
+/* 613 */,
+/* 614 */,
+/* 615 */,
+/* 616 */,
+/* 617 */,
+/* 618 */
+/*!*****************************************************************************!*\
+  !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-modal/props.js ***!
+  \*****************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  props: {
+    // 是否展示modal
+    show: {
+      type: Boolean,
+      default: uni.$u.props.modal.show
+    },
+    // 标题
+    title: {
+      type: [String],
+      default: uni.$u.props.modal.title
+    },
+    // 弹窗内容
+    content: {
+      type: String,
+      default: uni.$u.props.modal.content
+    },
+    // 确认文案
+    confirmText: {
+      type: String,
+      default: uni.$u.props.modal.confirmText
+    },
+    // 取消文案
+    cancelText: {
+      type: String,
+      default: uni.$u.props.modal.cancelText
+    },
+    // 是否显示确认按钮
+    showConfirmButton: {
+      type: Boolean,
+      default: uni.$u.props.modal.showConfirmButton
+    },
+    // 是否显示取消按钮
+    showCancelButton: {
+      type: Boolean,
+      default: uni.$u.props.modal.showCancelButton
+    },
+    // 确认按钮颜色
+    confirmColor: {
+      type: String,
+      default: uni.$u.props.modal.confirmColor
+    },
+    // 取消文字颜色
+    cancelColor: {
+      type: String,
+      default: uni.$u.props.modal.cancelColor
+    },
+    // 对调确认和取消的位置
+    buttonReverse: {
+      type: Boolean,
+      default: uni.$u.props.modal.buttonReverse
+    },
+    // 是否开启缩放效果
+    zoom: {
+      type: Boolean,
+      default: uni.$u.props.modal.zoom
+    },
+    // 是否异步关闭，只对确定按钮有效
+    asyncClose: {
+      type: Boolean,
+      default: uni.$u.props.modal.asyncClose
+    },
+    // 是否允许点击遮罩关闭modal
+    closeOnClickOverlay: {
+      type: Boolean,
+      default: uni.$u.props.modal.closeOnClickOverlay
+    },
+    // 给一个负的margin-top，往上偏移，避免和键盘重合的情况
+    negativeTop: {
+      type: [String, Number],
+      default: uni.$u.props.modal.negativeTop
+    },
+    // modal宽度，不支持百分比，可以数值，px，rpx单位
+    width: {
+      type: [String, Number],
+      default: uni.$u.props.modal.width
+    },
+    // 确认按钮的样式，circle-圆形，square-方形，如设置，将不会显示取消按钮
+    confirmButtonShape: {
+      type: String,
+      default: uni.$u.props.modal.confirmButtonShape
+    }
+  }
+};
+exports.default = _default;
+/* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
+
+/***/ }),
+/* 619 */,
+/* 620 */,
+/* 621 */,
+/* 622 */,
+/* 623 */,
+/* 624 */,
+/* 625 */,
+/* 626 */,
+/* 627 */
+/*!*************************************************************************************!*\
+  !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-line-progress/props.js ***!
+  \*************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/* WEBPACK VAR INJECTION */(function(uni) {
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  props: {
+    // 激活部分的颜色
+    activeColor: {
+      type: String,
+      default: uni.$u.props.lineProgress.activeColor
+    },
+    inactiveColor: {
+      type: String,
+      default: uni.$u.props.lineProgress.color
+    },
+    // 进度百分比，数值
+    percentage: {
+      type: [String, Number],
+      default: uni.$u.props.lineProgress.inactiveColor
+    },
+    // 是否在进度条内部显示百分比的值
+    showText: {
+      type: Boolean,
+      default: uni.$u.props.lineProgress.showText
+    },
+    // 进度条的高度，单位px
+    height: {
+      type: [String, Number],
+      default: uni.$u.props.lineProgress.height
+    }
+  }
+};
+exports.default = _default;
+/* 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/wike-painter/wike-painter.js

@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["components/wike-painter/wike-painter"],{
 
-/***/ 438:
+/***/ 446:
 /*!*********************************************************************!*\
   !*** D:/desktop/huibenPro/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& */ 439);
-/* 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& */ 441);
+/* 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& */ 447);
+/* 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& */ 449);
 /* 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& */ 447);
+/* 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& */ 455);
 /* 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"
 
 /***/ }),
 
-/***/ 439:
+/***/ 447:
 /*!****************************************************************************************************!*\
   !*** D:/desktop/huibenPro/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& */ 440);
+/* 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& */ 448);
 /* 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__);
 
 /***/ }),
 
-/***/ 440:
+/***/ 448:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/huibenPro/components/wike-painter/wike-painter.vue?vue&type=template&id=4a5229c4& ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -90,7 +90,7 @@ render._withStripped = true
 
 /***/ }),
 
-/***/ 441:
+/***/ 449:
 /*!**********************************************************************************************!*\
   !*** D:/desktop/huibenPro/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& */ 442);
+/* 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& */ 450);
 /* 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); 
 
 /***/ }),
 
-/***/ 442:
+/***/ 450:
 /*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/huibenPro/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 */ 443);
-var _props = _interopRequireDefault(__webpack_require__(/*! ./props */ 444));
-var _utils = __webpack_require__(/*! ./utils */ 445);
-var _painter = _interopRequireDefault(__webpack_require__(/*! ./painter */ 446));
+var _relation = __webpack_require__(/*! ./common/relation */ 451);
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props */ 452));
+var _utils = __webpack_require__(/*! ./utils */ 453);
+var _painter = _interopRequireDefault(__webpack_require__(/*! ./painter */ 454));
 //
 //
 //
@@ -690,7 +690,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 447:
+/***/ 455:
 /*!******************************************************************************************************!*\
   !*** D:/desktop/huibenPro/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& */ 448);
+/* 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& */ 456);
 /* 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); 
 
 /***/ }),
 
-/***/ 448:
+/***/ 456:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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/huibenPro/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__(438))
+            __webpack_require__('2')['createComponent'](__webpack_require__(446))
         })
     },
     [['components/wike-painter/wike-painter-create-component']]

unpackage/dist/dev/mp-weixin/pages/category/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 */ 392))
+      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 */ 400))
     },
   }
 } catch (e) {

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

@@ -0,0 +1,4 @@
+{
+  "navigationBarTitleText": "图片预览",
+  "usingComponents": {}
+}

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

@@ -0,0 +1 @@
+<view class="container data-v-a82faf38"><nav-bar vue-id="5dc535bc-1" title="图片预览" back="{{true}}" color="#333333" background="#FFFFFF" class="data-v-a82faf38" bind:__l="__l"></nav-bar><image src="{{url1}}" mode="widthFix" show-menu-by-longpress="{{true}}" class="data-v-a82faf38"></image><view class="btnBox data-v-a82faf38"><view data-event-opts="{{[['tap',[['toSave',['$event']]]]]}}" class="btn data-v-a82faf38" bindtap="__e">保存到手机相册</view></view></view>

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

@@ -0,0 +1,42 @@
+@charset "UTF-8";
+/* 水平间距 */
+/* 水平间距 */
+view.data-v-a82faf38 {
+  box-sizing: border-box;
+}
+.container.data-v-a82faf38 {
+  padding-bottom: 176rpx;
+}
+.container image.data-v-a82faf38 {
+  width: 100%;
+}
+.data-v-a82faf38 .u-popup__content {
+  border-radius: 30rpx !important;
+}
+.btnBox.data-v-a82faf38 {
+  height: 176rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx -2rpx 20rpx 0rpx rgba(0, 0, 0, 0.05);
+  border-radius: 32rpx 32rpx 0rpx 0rpx;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  padding-left: 30rpx;
+  padding-right: 30rpx;
+  padding-top: 32rpx;
+  z-index: 9999999999999999999999999999999;
+}
+.btnBox .btn.data-v-a82faf38 {
+  height: 96rpx;
+  background: linear-gradient(132deg, #0298FF 0%, #017AFF 100%);
+  box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0, 122, 255, 0.2);
+  border-radius: 54rpx;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 32rpx;
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-weight: bold;
+  color: #FFFFFF;
+}
+

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

@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uUpload: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-upload/u-upload.vue */ 402))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-upload/u-upload */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-upload/u-upload")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-upload/u-upload.vue */ 410))
     },
     uPicker: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-picker/u-picker.vue */ 412))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-picker/u-picker.vue */ 420))
     },
   }
 } catch (e) {
@@ -219,9 +219,11 @@ var _default = {
       formData: {
         nickName: '',
         sex: '',
-        age: '',
+        ageName: '',
+        age: -1,
         star: '',
-        class: ''
+        className: '',
+        class: -1
       },
       show: false,
       columns: [['男孩', '女孩']],
@@ -230,19 +232,36 @@ var _default = {
       show3: false,
       columns3: [['白羊座', '金牛座', '双子座 ', '巨蟹座', '狮子座', '处女座', '天秤座', '天蝎座', '射手座', '摩羯座', '水瓶座', '双鱼座']],
       show4: false,
-      columns4: [['蒙大一', '蒙大二', '蒙小一', '蒙小二', '蒙小三']],
+      columns4: [['幼儿园', '一年级', '二年级', '三年级', '四年级', '五年级', '六年级']],
       show5: false,
       columns5: [],
       roleId: -1,
-      diamond: 0
+      diamond: 0,
+      oldSeledRole: null
     };
   },
-  onLoad: function onLoad() {},
-  onShow: function onShow() {
+  onLoad: function onLoad() {
     this.getUserInfo();
     this.getRoleparmas();
+    this.reShow2();
+  },
+  onShow: function onShow() {
+    if (getApp().refreshRole) {
+      this.getRoleparmas();
+      getApp().refreshRole = null;
+    }
   },
   methods: {
+    reShow2: function reShow2() {
+      // 回显方式2
+      // this.formData.nickName = res1.data.data[i].name
+      this.formData.sex = this.columns[0][0];
+      this.formData.age = 1;
+      this.formData.ageName = '1岁';
+      this.formData.star = this.columns3[0][0];
+      this.formData.className = this.columns4[0][0];
+      this.formData.class = 0;
+    },
     getUserInfo: function getUserInfo() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
@@ -324,7 +343,7 @@ var _default = {
                 }
                 return _context2.abrupt("return", _this2.$toast('请选择性别'));
               case 9:
-                if (_this2.formData.age) {
+                if (!(_this2.formData.age == -1)) {
                   _context2.next = 11;
                   break;
                 }
@@ -336,13 +355,20 @@ var _default = {
                 }
                 return _context2.abrupt("return", _this2.$toast('请选择星座'));
               case 13:
-                if (_this2.formData.class) {
+                if (!(_this2.formData.class == -1)) {
                   _context2.next = 15;
                   break;
                 }
                 return _context2.abrupt("return", _this2.$toast('请选择班级'));
               case 15:
-                p = {};
+                p = {}; // 判断用户是否修改了角色信息
+                if (_this2.oldSeledRole) {
+                  if (_this2.oldSeledRole.name != _this2.formData.nickName || _this2.oldSeledRole.star != _this2.formData.star || _this2.oldSeledRole.sex != _this2.formData.sex || _this2.oldSeledRole.age != _this2.formData.age || _this2.oldSeledRole.level != _this2.formData.class) {
+                    console.log('用户修改了预置角色------------------');
+                    _this2.roleId = -1;
+                  }
+                }
+                console.log('用户wei修改了预置角色------------------');
                 if (_this2.roleId != -1) {
                   p = {
                     roleId: _this2.roleId,
@@ -353,14 +379,16 @@ var _default = {
                     image: _this2.fileList1[0].url,
                     name: _this2.formData.nickName,
                     sex: _this2.formData.sex,
-                    age: _this2.formData.age.slice(0, 1),
+                    age: _this2.formData.age,
                     star: _this2.formData.star,
                     level: _this2.formData.class
                   };
                 }
-                _context2.next = 19;
+
+                // return console.log('p----------------', p);
+                _context2.next = 21;
                 return (0, _index.postTask)(p);
-              case 19:
+              case 21:
                 res1 = _context2.sent;
                 console.log('生成任务提交返回值--------2', res1);
                 if (res1.code == 0) {
@@ -373,7 +401,7 @@ var _default = {
                 } else {
                   _this2.$toast(res1.message);
                 }
-              case 22:
+              case 24:
               case "end":
                 return _context2.stop();
             }
@@ -395,8 +423,29 @@ var _default = {
                 res1 = _context3.sent;
                 console.log('角色列表返回值--------2', res1);
                 if (res1.code == 0) {
+                  // res1.data.data = []
                   if (res1.data.data.length != 0) {
+                    res1.data.data = res1.data.data.reverse();
+
+                    // 用于比对用户是否修改主角内容
+                    // let i=res1.data.data.length-1
+
                     _this3.columns5[0] = res1.data.data;
+
+                    // 回显方式1
+                    // let i=0
+                    // this.oldSeledRole = res1.data.data[i]
+                    // this.roleId = res1.data.data[i].id
+                    // this.formData.nickName = res1.data.data[i].name
+                    // this.formData.sex = res1.data.data[i].sex
+
+                    // this.formData.age = res1.data.data[i].age
+                    // this.formData.ageName = this.columns2[0][Number(res1.data.data[i].age) - 1]
+
+                    // this.formData.star = res1.data.data[i].star
+
+                    // this.formData.className = this.columns4[0][Number(res1.data.data[i].level)]
+                    // this.formData.class = res1.data.data[i].level
                   } else {
                     _this3.columns5[0] = ['暂无'];
                   }
@@ -419,7 +468,8 @@ var _default = {
     },
     confirm2: function confirm2(e) {
       console.log('e', e);
-      this.formData.age = e.value[0];
+      this.formData.ageName = this.columns2[0][e.indexs[0]];
+      this.formData.age = e.indexs[0] + 1;
       this.show2 = false;
     },
     confirm3: function confirm3(e) {
@@ -429,7 +479,12 @@ var _default = {
     },
     confirm4: function confirm4(e) {
       console.log('e', e);
-      this.formData.class = e.value[0];
+
+      // this.formData.class = e.value[0]
+
+      this.formData.class = e.indexs[0];
+      this.formData.className = e.value[0];
+      console.log('confirm4--level', this.formData.class);
       this.show4 = false;
     },
     confirm5: function confirm5(e) {
@@ -437,12 +492,15 @@ var _default = {
         this.show5 = false;
         return;
       }
+      this.oldSeledRole = e.value[0];
       console.log('e-----5', e.indexs[0], e.value[0]);
       this.formData.class = e.value[0].level;
+      this.formData.className = this.columns4[0][Number(e.value[0].level)];
       this.formData.nickName = e.value[0].name;
       this.formData.sex = e.value[0].sex;
       this.formData.star = e.value[0].star;
-      this.formData.age = e.value[0].age + '岁';
+      this.formData.age = e.value[0].age;
+      this.formData.ageName = this.columns2[0][Number(e.value[0].age - 1)];
       this.roleId = e.value[0].id;
       this.show5 = false;
     },

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

@@ -100,8 +100,14 @@ __webpack_require__.r(__webpack_exports__);
 var components
 try {
   components = {
+    uLineProgress: function () {
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-line-progress/u-line-progress */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-line-progress/u-line-progress")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-line-progress/u-line-progress.vue */ 622))
+    },
     uParse: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-parse/u-parse */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-parse/u-parse")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-parse/u-parse.vue */ 420))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-parse/u-parse */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-parse/u-parse")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-parse/u-parse.vue */ 428))
+    },
+    uModal: function () {
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-modal/u-modal */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-modal/u-modal")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-modal/u-modal.vue */ 613))
     },
   }
 } catch (e) {
@@ -158,7 +164,7 @@ __webpack_require__.r(__webpack_exports__);
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";
-/* WEBPACK VAR INJECTION */(function(uni) {
+/* WEBPACK VAR INJECTION */(function(uni, wx) {
 
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ 4);
 Object.defineProperty(exports, "__esModule", {
@@ -206,6 +212,28 @@ var _index = __webpack_require__(/*! @/api/index/index.js */ 163);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 // import content from "../../../utils/pinyin.js"
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
@@ -219,8 +247,12 @@ var _default = {
       huibenRes: null,
       showLoading: true,
       timer: null,
+      timer1: null,
       content: '',
-      huibenDetail: null
+      huibenDetail: null,
+      percentage: 0,
+      tempPdfile: '',
+      showLead: false
     };
   },
   onLoad: function onLoad(o) {
@@ -233,9 +265,16 @@ var _default = {
       console.log('this.taskId', this.taskId);
       this.timer = setInterval(function () {
         _this2.getGenRes();
-      }, 2000);
+      }, 1000);
     }
     if (getApp().huibenDetail) {
+      this.timer1 = setInterval(function () {
+        if (_this2.percentage <= 50) {
+          _this2.percentage = _this2.percentage + 25;
+          console.log('this.percentage', _this2.percentage);
+        }
+      }, 1000);
+
       // this.showLoading = false
       // this.huibenDetail = getApp().huibenDetail
 
@@ -251,10 +290,31 @@ var _default = {
     }
   },
   methods: {
+    prePdf: function prePdf() {
+      this.showLead = false;
+      uni.openDocument({
+        filePath: this.tempPdfile,
+        showMenu: true,
+        //是否可以分享
+        success: function success(res) {
+          uni.hideLoading();
+          console.log(res);
+        },
+        fail: function fail(e) {
+          uni.showToast({
+            title: '打开失败',
+            icon: "error"
+          });
+        }
+      });
+    },
     downPic: function downPic() {
       if (!uni.getStorageSync('token')) {
         return this.$toast('请登录后操作');
       }
+      uni.showLoading({
+        title: '生成中'
+      });
       console.log('img-path', this.huibenRes.image_path);
       // this.pictureReview(this.huibenRes.image_path)
       this.download(this.huibenRes.image_path, 2);
@@ -274,6 +334,8 @@ var _default = {
       });
     },
     loaded: function loaded() {
+      clearInterval(this.timer1);
+      this.percentage = 100;
       this.showLoading = false;
       console.log('loaded()------');
     },
@@ -291,16 +353,19 @@ var _default = {
                 }
                 return _context.abrupt("return", _this3.$toast('请登录后操作'));
               case 2:
+                uni.showLoading({
+                  title: '生成中'
+                });
                 console.log('downPdf-------------', {
                   id: _this3.taskId != -1 ? _this3.taskId : _this3.huibenRes.id
                   // id: 4
                 });
-                _context.next = 5;
+                _context.next = 6;
                 return (0, _index.genPdf)({
                   id: _this3.taskId != -1 ? _this3.taskId : _this3.huibenRes.id
                   // id: 4
                 });
-              case 5:
+              case 6:
                 res1 = _context.sent;
                 console.log('获取pdfurl返回值--------2', res1);
                 if (res1.code == 0) {
@@ -309,7 +374,7 @@ var _default = {
                 } else {
                   _this3.$toast(res1.message);
                 }
-              case 8:
+              case 9:
               case "end":
                 return _context.stop();
             }
@@ -318,10 +383,9 @@ var _default = {
       }))();
     },
     download: function download(file, type) {
+      var _this4 = this;
       var _this = this;
-      uni.showLoading({
-        title: '下载中'
-      });
+
       //下载文件
       uni.downloadFile({
         //只能是GET请求
@@ -334,29 +398,22 @@ var _default = {
             var tempFile = res.tempFilePath;
             if (type == 2) {
               uni.hideLoading();
-              return _this.pictureReview(tempFile);
+              // return _this.pictureReview(tempFile)
+              return uni.navigateTo({
+                url: '/pages/index/filePre/index?url=' + tempFile
+              });
             }
+
             //保存成功之后 打开文件
             uni.getFileSystemManager().saveFile({
               tempFilePath: tempFile,
-              // filePath: wx.env.USER_DATA_PATH + '/' + '上传成员.pdf',//自定义文件名
+              filePath: wx.env.USER_DATA_PATH + '/' + _this4.huibenRes.title + '.pdf',
+              //自定义文件名
               success: function success(res) {
                 console.log(res);
-                uni.openDocument({
-                  filePath: res.savedFilePath,
-                  showMenu: true,
-                  //是否可以分享
-                  success: function success(res) {
-                    uni.hideLoading();
-                    console.log(res);
-                  },
-                  fail: function fail(e) {
-                    uni.showToast({
-                      title: '打开失败',
-                      icon: "error"
-                    });
-                  }
-                });
+                uni.hideLoading();
+                _this.tempPdfile = res.savedFilePath;
+                _this.showLead = true;
               }
             });
           }
@@ -371,13 +428,14 @@ var _default = {
       });
     },
     onBack: function onBack() {
+      getApp().refreshRole = true;
       console.log('onBack()-----------');
       if (this.timer) {
         clearInterval(this.timer);
       }
     },
     getGenRes: function getGenRes() {
-      var _this4 = this;
+      var _this5 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var res1;
         return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -386,21 +444,34 @@ var _default = {
               case 0:
                 _context2.next = 2;
                 return (0, _index.getGenRes)({
-                  id: _this4.taskId
+                  id: _this5.taskId
                 });
               case 2:
                 res1 = _context2.sent;
                 console.log('查询生成结果返回值--------2', res1);
                 if (res1.code == 0) {
-                  if (res1.data.state == 6) {
-                    _this4.huibenRes = res1.data;
-                    _this4.content = "".concat(res1.data.pinyin_content);
-                    _this4.showLoading = false;
-                    clearInterval(_this4.timer);
+                  if (res1.data.state == 0) {
+                    _this5.percentage = 10;
+                  } else if (res1.data.state == 1) {
+                    _this5.percentage = 16;
+                  } else if (res1.data.state == 2) {
+                    _this5.percentage = 32;
+                  } else if (res1.data.state == 3) {
+                    _this5.percentage = 48;
+                  } else if (res1.data.state == 4) {
+                    _this5.percentage = 64;
+                  } else if (res1.data.state == 5) {
+                    _this5.percentage = 80;
+                  } else if (res1.data.state == 6) {
+                    _this5.huibenRes = res1.data;
+                    _this5.content = "".concat(res1.data.pinyin_content);
+                    _this5.percentage = 99;
+                    // this.showLoading = false
+                    clearInterval(_this5.timer);
                   }
                   // this.chargeList=[]
                 } else {
-                  _this4.$toast(res1.message);
+                  _this5.$toast(res1.message);
                 }
               case 5:
               case "end":
@@ -413,7 +484,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/index.js */ 2)["default"], __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/wx.js */ 1)["default"]))
 
 /***/ }),
 

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

@@ -1,6 +1,8 @@
 {
   "navigationBarTitleText": "绘本生成",
   "usingComponents": {
-    "u-parse": "/uni_modules/uview-ui/components/u-parse/u-parse"
+    "u-line-progress": "/uni_modules/uview-ui/components/u-line-progress/u-line-progress",
+    "u-parse": "/uni_modules/uview-ui/components/u-parse/u-parse",
+    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal"
   }
 }

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

@@ -50,14 +50,28 @@ view.data-v-a3a870ee {
 .container .mainBox .contentBox .storeBox.data-v-a3a870ee {
   position: relative;
 }
-.container .mainBox .contentBox .storeBox .loadingImg.data-v-a3a870ee {
+.container .mainBox .contentBox .storeBox .loading.data-v-a3a870ee {
   position: absolute;
-  top: 150rpx;
-  left: 50%;
+  top: 0;
+  left: 0;
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+  flex-direction: column;
+}
+.container .mainBox .contentBox .storeBox .loading .loadingImg.data-v-a3a870ee {
+  margin-top: 50rpx;
   width: 500rpx;
   height: 500rpx;
-  -webkit-transform: translate(-50%, 0%);
-          transform: translate(-50%, 0%);
+}
+.container .mainBox .contentBox .storeBox .loading .progress.data-v-a3a870ee {
+  width: 100%;
+  margin-top: 100rpx;
+}
+.container .mainBox .contentBox .storeBox .loading .progress .tipTxt.data-v-a3a870ee {
+  margin-top: 50rpx;
+  color: #017AFF;
 }
 .container .mainBox .contentBox .storeBox text.data-v-a3a870ee {
   font-size: 28rpx;
@@ -122,6 +136,17 @@ view.data-v-a3a870ee {
   font-weight: bold;
   color: #017AFF;
 }
+.data-v-a3a870ee .u-popup__content {
+  border-radius: 30rpx !important;
+}
+.slot-content .txt1.data-v-a3a870ee {
+  margin-bottom: 10rpx;
+}
+.slot-content .caidan.data-v-a3a870ee {
+  width: 100%;
+  height: 30rpx;
+  margin-top: 10rpx;
+}
 .data-v-a3a870ee .pinyin {
   font-size: 2rem;
   color: red !important;

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

@@ -101,13 +101,13 @@ var components
 try {
   components = {
     uSwiper: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-swiper/u-swiper.vue */ 361))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-swiper/u-swiper */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-swiper/u-swiper")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-swiper/u-swiper.vue */ 369))
     },
     uEmpty: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-empty/u-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-empty/u-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-empty/u-empty.vue */ 369))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-empty/u-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-empty/u-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-empty/u-empty.vue */ 377))
     },
     uLoadmore: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-loadmore/u-loadmore */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-loadmore/u-loadmore")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-loadmore/u-loadmore.vue */ 377))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-loadmore/u-loadmore */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-loadmore/u-loadmore")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-loadmore/u-loadmore.vue */ 385))
     },
   }
 } catch (e) {
@@ -188,7 +188,7 @@ var _config = _interopRequireDefault(__webpack_require__(/*! @/common/config.js
 var _methods;
 var PrivacyPopup = function PrivacyPopup() {
   __webpack_require__.e(/*! require.ensure | components/privacyPopup/index */ "components/privacyPopup/index").then((function () {
-    return resolve(__webpack_require__(/*! @/components/privacyPopup/index.vue */ 385));
+    return resolve(__webpack_require__(/*! @/components/privacyPopup/index.vue */ 393));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {
@@ -204,7 +204,11 @@ var _default = {
       navImg: this.$picBase + 'logo.png',
       showPop: false,
       urlTitle: '',
-      list1: ['https://cdn.uviewui.com/uview/swiper/swiper1.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper3.png'],
+      list1: [
+        // 'https://cdn.uviewui.com/uview/swiper/swiper1.png',
+        // 'https://cdn.uviewui.com/uview/swiper/swiper2.png',
+        // 'https://cdn.uviewui.com/uview/swiper/swiper3.png',
+      ],
       tabBarList: [{
         "pagePath": "pages/index/index",
         "iconPath": "../../static/tabbar/index.png",
@@ -322,10 +326,9 @@ var _default = {
                 if (res1.code == 0) {
                   tempList = [];
                   res1.data.forEach(function (item, index) {
-                    tempList.push(_config.default.baseUrl + '/' + item.image_path);
+                    tempList.push(item.image_path);
                   });
-
-                  // this.list1 = tempList
+                  _this4.list1 = tempList;
                   console.log('list1', _this4.list1);
                 } else {
                   _this4.$toast(res1.message);

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

@@ -127,4 +127,7 @@
   padding-left: 20rpx;
   padding-bottom: 24rpx;
 }
+.data-v-57280228 .u-swiper {
+  border-radius: 0 !important;
+}
 

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

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

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

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uPicker: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-picker/u-picker.vue */ 412))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-picker/u-picker.vue */ 420))
     },
   }
 } catch (e) {
@@ -269,6 +269,9 @@ var _index = __webpack_require__(/*! @/api/index/index.js */ 163);
 //
 //
 //
+//
+//
+//
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
   // components: {
@@ -287,7 +290,9 @@ var _default = {
         account: '',
         bankName: ''
       },
-      showPopup: false
+      showPopup: false,
+      Ratio: 0,
+      min: 0
     };
   },
   onLoad: function onLoad(o) {
@@ -295,29 +300,45 @@ var _default = {
     // this.availMoney = Number(o.availMoney || 0)
     // console.log('传递过来的可提现余额', o.availMoney)
     // }
+    this.getCashTip();
+  },
+  onShow: function onShow() {
     this.getYongjinList();
   },
   methods: {
-    getYongjinList: function getYongjinList() {
+    getCashTip: function getCashTip() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var res1;
+        var res1, res2;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return (0, _index.getYongjinList)();
+                return (0, _index.getPosterBg)({
+                  key: 'withdraw'
+                });
               case 2:
                 res1 = _context.sent;
-                console.log('佣金明细返回值--------', res1);
+                console.log('提现提示返回值--------1', res1);
                 if (res1.code == 0) {
-                  _this.availMoney = Number(res1.data.withdrawIncome || 0);
-                  console.log('可提现佣金--------', _this.availMoney);
+                  _this.Ratio = res1.data.value;
                 } else {
                   _this.$toast(res1.message);
                 }
-              case 5:
+                _context.next = 7;
+                return (0, _index.getPosterBg)({
+                  key: 'withdraw_min'
+                });
+              case 7:
+                res2 = _context.sent;
+                console.log('提现提示返回值--------2', res2);
+                if (res2.code == 0) {
+                  _this.min = res2.data.value;
+                } else {
+                  _this.$toast(res2.message);
+                }
+              case 10:
               case "end":
                 return _context.stop();
             }
@@ -325,107 +346,143 @@ var _default = {
         }, _callee);
       }))();
     },
-    post: function post() {
+    getYongjinList: function getYongjinList() {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var p, res1;
+        var res1;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                if (!(Number(_this2.formData.money) > _this2.availMoney)) {
-                  _context2.next = 4;
+                _context2.next = 2;
+                return (0, _index.getYongjinList)();
+              case 2:
+                res1 = _context2.sent;
+                console.log('佣金明细返回值--------', res1);
+                if (res1.code == 0) {
+                  _this2.availMoney = Number(res1.data.withdrawIncome || 0);
+                  console.log('可提现佣金--------', _this2.availMoney);
+                } else {
+                  _this2.$toast(res1.message);
+                }
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }))();
+    },
+    post: function post() {
+      var _this3 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+        var p, res1;
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                if (!(Number(_this3.formData.money) > _this3.availMoney)) {
+                  _context3.next = 4;
                   break;
                 }
-                return _context2.abrupt("return", wx.showToast({
+                return _context3.abrupt("return", wx.showToast({
                   title: '可提现余额不足',
                   icon: 'none'
                 }));
               case 4:
-                if (_this2.formData.money) {
-                  _context2.next = 8;
+                if (_this3.formData.money) {
+                  _context3.next = 8;
                   break;
                 }
-                return _context2.abrupt("return", wx.showToast({
+                return _context3.abrupt("return", wx.showToast({
                   title: '请输入提现金额',
                   icon: 'none'
                 }));
               case 8:
-                if (_this2.formData.name) {
-                  _context2.next = 12;
+                if (!(Number(_this3.formData.money) < Number(_this3.min))) {
+                  _context3.next = 12;
                   break;
                 }
-                return _context2.abrupt("return", wx.showToast({
-                  title: '请输入名字',
+                return _context3.abrupt("return", wx.showToast({
+                  title: '单次最低提现金额为' + _this3.min,
                   icon: 'none'
                 }));
               case 12:
-                if (!(!_this2.formData.bankName && _this2.currWay == '银行卡')) {
-                  _context2.next = 16;
+                if (_this3.formData.name) {
+                  _context3.next = 16;
                   break;
                 }
-                return _context2.abrupt("return", wx.showToast({
-                  title: '请输入开户行名称',
+                return _context3.abrupt("return", wx.showToast({
+                  title: '请输入名字',
                   icon: 'none'
                 }));
               case 16:
-                if (_this2.formData.account) {
-                  _context2.next = 18;
+                if (!(!_this3.formData.bankName && _this3.currWay == '银行卡')) {
+                  _context3.next = 20;
                   break;
                 }
-                return _context2.abrupt("return", wx.showToast({
+                return _context3.abrupt("return", wx.showToast({
+                  title: '请输入开户行名称',
+                  icon: 'none'
+                }));
+              case 20:
+                if (_this3.formData.account) {
+                  _context3.next = 22;
+                  break;
+                }
+                return _context3.abrupt("return", wx.showToast({
                   title: '请输入账号',
                   icon: 'none'
                 }));
-              case 18:
+              case 22:
                 p = {};
-                if (_this2.currWayIndex[0] == 0) {
+                if (_this3.currWayIndex[0] == 0) {
                   p = {
-                    type: _this2.currWayIndex[0] + 1,
-                    amount: _this2.formData.money,
-                    name: _this2.formData.name,
-                    number: _this2.formData.account
+                    type: _this3.currWayIndex[0] + 1,
+                    amount: _this3.formData.money,
+                    name: _this3.formData.name,
+                    number: _this3.formData.account
                   };
-                } else if (_this2.currWayIndex[0] == 1) {
+                } else if (_this3.currWayIndex[0] == 1) {
                   p = {
-                    type: _this2.currWayIndex[0] + 1,
-                    amount: _this2.formData.money,
-                    name: _this2.formData.name,
-                    number: _this2.formData.account
+                    type: _this3.currWayIndex[0] + 1,
+                    amount: _this3.formData.money,
+                    name: _this3.formData.name,
+                    number: _this3.formData.account
                   };
                 } else {
                   p = {
-                    type: _this2.currWayIndex[0] + 1,
-                    amount: _this2.formData.money,
-                    name: _this2.formData.name,
-                    number: _this2.formData.account,
-                    bank_name: _this2.formData.bankName
+                    type: _this3.currWayIndex[0] + 1,
+                    amount: _this3.formData.money,
+                    name: _this3.formData.name,
+                    number: _this3.formData.account,
+                    bank_name: _this3.formData.bankName
                   };
                 }
-                console.log('提现参数', p, _this2.formData, _this2.currWayIndex[0]);
+                console.log('提现参数', p, _this3.formData, _this3.currWayIndex[0]);
 
                 // return
-                _context2.next = 23;
+                _context3.next = 27;
                 return (0, _index.userWithdraw)(p);
-              case 23:
-                res1 = _context2.sent;
+              case 27:
+                res1 = _context3.sent;
                 console.log('提现返回值--------', res1);
                 if (res1.code == 0) {
-                  _this2.$toast('提交成功', 'success');
+                  _this3.$toast('提交成功', 'success');
                   setTimeout(function () {
-                    uni.navigateTo({
+                    uni.redirectTo({
                       url: '/pages/my/cashRecord/index'
                     });
                   }, 1500);
                 } else {
-                  _this2.$toast(res1.message);
+                  _this3.$toast(res1.message);
                 }
-              case 26:
+              case 30:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2);
+        }, _callee3);
       }))();
     },
     handleConfirm: function handleConfirm(e) {

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

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

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

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

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

@@ -404,9 +404,15 @@ var _default = {
         if (!uni.getStorageSync('token')) {
           return this.$toast('请登录后操作');
         }
-        uni.navigateTo({
-          url: '/pages/my/pubCenter/index'
-        });
+        if (this.userInfo.is_share == 0) {
+          uni.navigateTo({
+            url: '/pages/my/jiangli/index'
+          });
+        } else {
+          uni.navigateTo({
+            url: '/pages/my/pubCenter/index'
+          });
+        }
       } else if (i == 1) {
         if (!uni.getStorageSync('token')) {
           return this.$toast('请登录后操作');

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

@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uEmpty: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-empty/u-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-empty/u-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-empty/u-empty.vue */ 369))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-empty/u-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-empty/u-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-empty/u-empty.vue */ 377))
     },
   }
 } catch (e) {
@@ -262,6 +262,9 @@ var _index = __webpack_require__(/*! @/api/index/index.js */ 163);
 //
 //
 //
+//
+//
+//
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
   // components: {
@@ -272,43 +275,100 @@ var _default = {
       picBase: this.$picBase2,
       jiangli: {
         data: []
-      }
+      },
+      shareTitle: null,
+      shareImg: ''
     };
   },
   onLoad: function onLoad() {
     this.getTuijian();
+    this.getShare();
+  },
+  onShareAppMessage: function onShareAppMessage(params) {
+    if (params.from === 'button' || params.from === 'menu') {
+      return {
+        title: this.shareTitle,
+        imageUrl: this.$ossBaseUrl + this.shareImg,
+        path: '/pages/index/index?scene=' + uni.getStorageSync('userInfo').id || false,
+        mpId: this.$appId,
+        type: this.$shareType
+      };
+    }
   },
   methods: {
-    toTuijian: function toTuijian() {
-      uni.navigateTo({
-        url: '/pages/my/tuiguangDashi/index'
-      });
-    },
-    getTuijian: function getTuijian() {
+    getShare: function getShare() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var res1;
+        var res1, res2;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return (0, _index.getTuijian)();
+                return (0, _index.getPosterBg)({
+                  key: 'share_title'
+                });
               case 2:
                 res1 = _context.sent;
-                console.log('推荐奖励返回值--------2', res1);
+                console.log('分享信息返回值--------1', res1);
                 if (res1.code == 0) {
-                  _this.jiangli = res1.data;
+                  _this.shareTitle = res1.data.value;
                 } else {
                   _this.$toast(res1.message);
                 }
-              case 5:
+                _context.next = 7;
+                return (0, _index.getPosterBg)({
+                  key: 'share_image'
+                });
+              case 7:
+                res2 = _context.sent;
+                console.log('分享信息返回值--------2', res2);
+                if (res2.code == 0) {
+                  _this.shareImg = res2.data.value;
+                } else {
+                  _this.$toast(res2.message);
+                }
+
+                // 
+              case 10:
               case "end":
                 return _context.stop();
             }
           }
         }, _callee);
       }))();
+    },
+    toTuijian: function toTuijian() {
+
+      // uni.navigateTo({
+      // 	url: '/pages/my/tuiguangDashi/index'
+      // })
+    },
+    getTuijian: function getTuijian() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var res1;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return (0, _index.getTuijian)();
+              case 2:
+                res1 = _context2.sent;
+                console.log('推荐奖励返回值--------2', res1);
+                if (res1.code == 0) {
+                  _this2.jiangli = res1.data;
+                } else {
+                  _this2.$toast(res1.message);
+                }
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }))();
     }
   }
 };