李万涛 1 年之前
父節點
當前提交
ffa7cf1929
共有 100 個文件被更改,包括 838 次插入583 次删除
  1. 7 2
      pages/index/genHuiBen/index.scss
  2. 12 11
      pages/index/genHuiBen/index.vue
  3. 26 20
      pages/index/genRes/index.vue
  4. 62 20
      pages/my/huiBen_record/index.vue
  5. 22 3
      pages/my/jiangli/index.vue
  6. 1 1
      pages/my/kefu/index.vue
  7. 13 3
      pages/my/protocol/index.vue
  8. 2 0
      pages/my/roleManage/index.scss
  9. 1 0
      pages/my/roleManage/index.vue
  10. 37 12
      pages/my/roleManageDetail/index.vue
  11. 21 3
      pages/my/tuiguangDashi/index.vue
  12. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map
  13. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map
  14. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map
  15. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/navBar/index.js.map
  16. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/privacyPopup/index.js.map
  17. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/tabBar/index.js.map
  18. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/components/wike-painter/wike-painter.js.map
  19. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/filePre/index.js.map
  20. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/genHuiBen/index.js.map
  21. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/genRes/index.js.map
  22. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
  23. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/aboutUs/index.js.map
  24. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/cash/index.js.map
  25. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/cashRecord/index.js.map
  26. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/charge/index.js.map
  27. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/huiBen_record/index.js.map
  28. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map
  29. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/jiangli/index.js.map
  30. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/kefu/index.js.map
  31. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myRecord/index.js.map
  32. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/index.js.map
  33. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/pubCenter/index.js.map
  34. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/roleManage/index.js.map
  35. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/roleManageDetail/index.js.map
  36. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/team/index.js.map
  37. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/tuiguangDashi/index.js.map
  38. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/tuiguangHaibao/index.js.map
  39. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/userInfo/index.js.map
  40. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/yongjinDetail/index.js.map
  41. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map
  42. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js.map
  43. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map
  44. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-empty/u-empty.js.map
  45. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map
  46. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line-progress/u-line-progress.js.map
  47. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js.map
  48. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map
  49. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loadmore/u-loadmore.js.map
  50. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.js.map
  51. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map
  52. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-parse/node/node.js.map
  53. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-parse/u-parse.js.map
  54. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js.map
  55. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map
  56. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map
  57. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map
  58. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map
  59. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swiper/u-swiper.js.map
  60. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabs/u-tabs.js.map
  61. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js.map
  62. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map
  63. 0 0
      unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-upload/u-upload.js.map
  64. 2 2
      unpackage/dist/dev/mp-weixin/common/main.js
  65. 1 1
      unpackage/dist/dev/mp-weixin/common/runtime.js
  66. 226 210
      unpackage/dist/dev/mp-weixin/common/vendor.js
  67. 12 12
      unpackage/dist/dev/mp-weixin/components/navBar/index.js
  68. 12 12
      unpackage/dist/dev/mp-weixin/components/privacyPopup/index.js
  69. 2 2
      unpackage/dist/dev/mp-weixin/components/privacyPopup/index.json
  70. 11 11
      unpackage/dist/dev/mp-weixin/components/tabBar/index.js
  71. 18 18
      unpackage/dist/dev/mp-weixin/components/wike-painter/wike-painter.js
  72. 16 17
      unpackage/dist/dev/mp-weixin/pages/index/genHuiBen/index.js
  73. 4 2
      unpackage/dist/dev/mp-weixin/pages/index/genHuiBen/index.wxss
  74. 10 6
      unpackage/dist/dev/mp-weixin/pages/index/genRes/index.js
  75. 4 4
      unpackage/dist/dev/mp-weixin/pages/index/index.js
  76. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/aboutUs/index.js
  77. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/cash/index.js
  78. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/cashRecord/index.js
  79. 71 28
      unpackage/dist/dev/mp-weixin/pages/my/huiBen_record/index.js
  80. 2 1
      unpackage/dist/dev/mp-weixin/pages/my/huiBen_record/index.json
  81. 0 1
      unpackage/dist/dev/mp-weixin/pages/my/huiBen_record/index.wxml
  82. 23 4
      unpackage/dist/dev/mp-weixin/pages/my/jiangli/index.js
  83. 0 0
      unpackage/dist/dev/mp-weixin/pages/my/jiangli/index.wxml
  84. 2 2
      unpackage/dist/dev/mp-weixin/pages/my/kefu/index.js
  85. 2 2
      unpackage/dist/dev/mp-weixin/pages/my/myRecord/index.js
  86. 5 3
      unpackage/dist/dev/mp-weixin/pages/my/protocol/index.js
  87. 15 14
      unpackage/dist/dev/mp-weixin/pages/my/roleManage/index.js
  88. 63 48
      unpackage/dist/dev/mp-weixin/pages/my/roleManageDetail/index.js
  89. 0 0
      unpackage/dist/dev/mp-weixin/pages/my/roleManageDetail/index.wxml
  90. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/team/index.js
  91. 58 26
      unpackage/dist/dev/mp-weixin/pages/my/tuiguangDashi/index.js
  92. 0 0
      unpackage/dist/dev/mp-weixin/pages/my/tuiguangDashi/index.wxml
  93. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/tuiguangHaibao/index.js
  94. 1 1
      unpackage/dist/dev/mp-weixin/pages/my/yongjinDetail/index.js
  95. 3 10
      unpackage/dist/dev/mp-weixin/project.private.config.json
  96. 12 12
      unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js
  97. 12 12
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js
  98. 16 16
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js
  99. 13 13
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-empty/u-empty.js
  100. 13 13
      unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js

+ 7 - 2
pages/index/genHuiBen/index.scss

xqd
@@ -256,17 +256,22 @@
 		align-items: center;
 		justify-content: space-between;
 		
-		padding-left: 66rpx;
+		// padding-left: 66rpx;
 		padding-right: 30rpx;
 		.left{
 			display: flex;
 			flex-direction: column;
 			justify-content: center;
-			align-items: center;
+			align-items: flex-start;
 			font-size: 20rpx;
 			font-family: PingFang-SC, PingFang-SC;
 			font-weight: 500;
 			color: #333333;
+			
+			height: 108rpx;
+			width: calc(100% - 552rpx);
+			// background: red;
+			padding-left: 66rpx;
 			.kfIcon{
 				width: 38rpx;
 				height: 40rpx;

+ 12 - 11
pages/index/genHuiBen/index.vue

xqd xqd
@@ -196,7 +196,7 @@
 			this.getUserInfo()
 			this.getRoleparmas()
 
-			this.reShow2()
+			// this.reShow2()
 		},
 		onShow() {
 			// if (getApp().refreshRole) {
@@ -339,23 +339,24 @@
 
 
 						// 回显方式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
+						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.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.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
+						this.formData.className = this.columns4[0][Number(res1.data.data[i].level)]
+						this.formData.class = res1.data.data[i].level
 
 
 
 					} else {
+						this.reShow2()
 						this.columns5[0] = ['暂无']
 					}
 					// this.chargeList=[]

+ 26 - 20
pages/index/genRes/index.vue

xqd xqd xqd xqd xqd xqd xqd xqd
@@ -42,16 +42,16 @@
 				生成图片
 			</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>
+				,再点击弹框中的保存到手机按钮,如图2:
+				<image src="../../../static/other/caidan_s.jpg" mode="widthFix" class="caidan"></image>
 			</view>
 		</u-modal>
 	</view>
@@ -82,10 +82,10 @@
 				huibenDetail: null,
 
 				percentage: 0,
-				
-				
-				tempPdfile:'',
-				showLead:false
+
+
+				tempPdfile: '',
+				showLead: false
 			}
 		},
 		onLoad(o) {
@@ -114,8 +114,12 @@
 				// this.showLoading = false
 				// this.huibenDetail = getApp().huibenDetail
 
+				let firstImg = `<img src="${getApp().huibenDetail.image}"/>`
+				getApp().huibenDetail.pinyin_content = firstImg + getApp().huibenDetail.pinyin_content
 				this.huibenRes = getApp().huibenDetail
-				this.content = `${getApp().huibenDetail.pinyin_content}`
+
+				console.log('this.huibenRes', this.huibenRes);
+				// this.content = `${getApp().huibenDetail.pinyin_content}`
 
 				// setTimeout(() => {
 				// 	this.showLoading = false
@@ -127,8 +131,8 @@
 
 		},
 		methods: {
-			prePdf(){
-				this.showLead=false
+			prePdf() {
+				this.showLead = false
 				uni.openDocument({
 					filePath: this.tempPdfile,
 					showMenu: true, //是否可以分享
@@ -205,7 +209,7 @@
 
 			download(file, type) {
 				let _this = this
-				
+
 				//下载文件
 				uni.downloadFile({ //只能是GET请求
 					url: file, //请求地址(后台返回的码流地址)
@@ -223,17 +227,18 @@
 								})
 
 							}
-							
+
 							//保存成功之后 打开文件
 							uni.getFileSystemManager().saveFile({
 								tempFilePath: tempFile,
-								filePath: wx.env.USER_DATA_PATH + '/' + this.huibenRes.title+'.pdf',//自定义文件名
+								filePath: wx.env.USER_DATA_PATH + '/' + this.huibenRes.title +
+									'.pdf', //自定义文件名
 								success(res) {
 									console.log(res)
 									uni.hideLoading()
-									
-									_this.tempPdfile=res.savedFilePath
-									_this.showLead=true
+
+									_this.tempPdfile = res.savedFilePath
+									_this.showLead = true
 								}
 							})
 						}
@@ -251,7 +256,7 @@
 			},
 
 			onBack() {
-				getApp().refreshRole=true
+				getApp().refreshRole = true
 
 				console.log('onBack()-----------');
 				if (this.timer) {
@@ -277,9 +282,10 @@
 					} 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}`
 
+						let firstImg = `<img src="${res1.data.image}"/>`
+						res1.data.pinyin_content = firstImg + res1.data.pinyin_content
+						this.huibenRes = res1.data
 						this.percentage = 99
 						// this.showLoading = false
 						clearInterval(this.timer)

+ 62 - 20
pages/my/huiBen_record/index.vue

xqd xqd xqd xqd xqd xqd
@@ -21,8 +21,9 @@
 
 
 					<view class="btnBox">
-						<view class="item1" @click="downPdf(item.id)">
-							绘本下载
+						<view class="item1" @click="downPdf(item.id,item)">
+							<!-- 绘本下载 -->
+							PDF生成
 						</view>
 						<view class="item1 bg" @click="toDetail(item)">
 							绘本详情
@@ -31,6 +32,17 @@
 				</view>
 			</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>
 
@@ -49,14 +61,37 @@
 		data() {
 			return {
 				picBase: this.$picBase2,
-				cusumerList: []
+				cusumerList: [],
+
+				huibenItem: null,
+
+				tempPdfile: '',
+				showLead: false
 			}
 		},
 		onLoad() {
 			this.getConsumerRecord()
 		},
 		methods: {
-			async downPdf(id) {
+			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"
+						})
+					}
+				})
+			},
+			async downPdf(id, item) {
+				this.huibenItem = item
 				console.log('downPdf-------------');
 				let res1 = await genPdf({
 					// id:this.taskId
@@ -67,6 +102,7 @@
 				if (res1.code == 0) {
 
 					console.log('pdf地址:', res1.data.url);
+
 					this.download(res1.data.url, 1)
 				} else {
 					this.$toast(res1.message)
@@ -81,7 +117,7 @@
 			download(file, type) {
 				let _this = this
 				uni.showLoading({
-					title: '下载中'
+					title: '生成中'
 				});
 				//下载文件
 				uni.downloadFile({ //只能是GET请求
@@ -99,23 +135,29 @@
 							//保存成功之后 打开文件
 							uni.getFileSystemManager().saveFile({
 								tempFilePath: tempFile,
-								// filePath: wx.env.USER_DATA_PATH + '/' + '上传成员.pdf',//自定义文件名
+								filePath: wx.env.USER_DATA_PATH + '/' + this.huibenItem.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
+									// uni.openDocument({
+									// 	filePath: res.savedFilePath,
+									// 	showMenu: true, //是否可以分享
+									// 	success: (res) => {
+									// 		uni.hideLoading()
+
+
+									// 		console.log(res);
+									// 	},
+									// 	fail: (e) => {
+									// 		uni.showToast({
+									// 			title: '打开失败',
+									// 			icon: "error"
+									// 		})
+									// 	}
+									// })
 
 								}
 							})

+ 22 - 3
pages/my/jiangli/index.vue

xqd xqd xqd xqd xqd
@@ -38,7 +38,9 @@
 						推荐奖励说明
 					</view>
 					<view class="bot">
-						推荐新用户,新用户成功注册后,将奖励推荐次数5次。推荐越多,奖励将会越多哦!
+						<!-- 推荐新用户,新用户成功注册后,将奖励推荐次数5次。推荐越多,奖励将会越多哦! -->
+
+						{{sm}}
 					</view>
 				</view>
 
@@ -58,7 +60,7 @@
 									class="avatar"></image>
 								<view class="des">
 									<view class="name">
-										{{item.user.name}}
+										{{item.user.name?item.user.name:'默认用户'}}
 									</view>
 									<view class="time">
 										{{item.updated_at}}
@@ -83,6 +85,10 @@
 				立即推荐
 			</button>
 		</view>
+
+		<!-- <view class="" style="height: 800px;">
+
+		</view> -->
 	</view>
 </template>
 
@@ -103,7 +109,9 @@
 					data: []
 				},
 				shareTitle: null,
-				shareImg: ''
+				shareImg: '',
+
+				sm: ''
 			}
 		},
 		onLoad() {
@@ -144,6 +152,17 @@
 					this.$toast(res2.message)
 				}
 
+				let res3 = await getPosterBg({
+					key: 'push_promotion'
+				})
+				console.log('奖励说明返回值--------2', res3);
+				if (res3.code == 0) {
+					this.sm = res3.data.value
+				} else {
+					this.$toast(res3.message)
+				}
+
+
 				// 
 			},
 

+ 1 - 1
pages/my/kefu/index.vue

xqd
@@ -66,7 +66,7 @@
 				if (res1.code == 0) {
 					this.phone = res1.data.service_phone.value
 					this.weiChat = res1.data.service_wx.value
-					this.code = res1.data.service_qrcode.value
+					this.code = this.$ossBaseUrl + res1.data.service_qrcode.value
 
 					console.log(this.phone, this.weiChat, this.code);
 				} else {

+ 13 - 3
pages/my/protocol/index.vue

xqd xqd
@@ -14,7 +14,8 @@
 	import {
 		getyonghu,
 		getyinsi,
-		getKefu
+		getKefu,
+		getPosterBg
 	} from '@/api/index/index.js'
 	export default {
 		// components: {
@@ -56,10 +57,19 @@
 					}
 				} else {
 					// this.content = '推广员功能服务协议'
-					let res1 = await getKefu()
+					// let res1 = await getKefu()
+					// console.log('推广协议返回值--------2', res1);
+					// if (res1.code == 0) {
+					// 	this.content = res1.data.push.value
+					// } else {
+					// 	this.$toast(res1.message)
+					// }
+					let res1 = await getPosterBg({
+						key: 'agreement_share'
+					})
 					console.log('推广协议返回值--------2', res1);
 					if (res1.code == 0) {
-						this.content = res1.data.push.value
+						this.content = res1.data.value
 					} else {
 						this.$toast(res1.message)
 					}

+ 2 - 0
pages/my/roleManage/index.scss

xqd
@@ -54,6 +54,8 @@
 	        padding: 32rpx 24rpx;
 			background-size: 100% 100%;
 			background-repeat: no-repeat;
+			
+			// background: red;
 	
 	        .top {
 	            .currLabel {

+ 1 - 0
pages/my/roleManage/index.vue

xqd
@@ -5,6 +5,7 @@
 		<view class='box' v-if="roleList.length!=0">
 			<view class='itemBox' v-for="(item,index) in roleList" :key="index">
 				<view class='item' :style="{'background-image':`url(${picBase+'card_bg2.png'})`}">
+					<!-- <view class='item'> -->
 					<view class='top'>
 						<view class='currLabel'>
 							<!-- <image class='icon'  mode="" src="" /> -->

+ 37 - 12
pages/my/roleManageDetail/index.vue

xqd xqd xqd
@@ -51,17 +51,17 @@
 
 
 
-		<u-picker :show="show" class="my-picker" title="性别选择" aColor="#007AFF" :columns="columns" confirmColor="#007AFF"
-			@confirm="confirm1" @cancel="show=false"></u-picker>
-		<u-picker :show="show2" title="年龄选择" keyName="label" aColor="#007AFF" :columns="columns2" confirmColor="#007AFF"
-			@confirm="confirm2" @cancel="show2=false"></u-picker>
-		<u-picker :show="show3" title="星座选择" aColor="#007AFF" :columns="columns3" confirmColor="#007AFF"
-			@confirm="confirm3" @cancel="show3=false"></u-picker>
-		<u-picker :show="show4" title="班级选择" aColor="#007AFF" :columns="columns4" confirmColor="#007AFF"
-			@confirm="confirm4" @cancel="show4=false"></u-picker>
-
-		<u-picker keyName="name" :show="show5" title="选择主角" aColor="#007AFF" :columns="columns5" confirmColor="#007AFF"
-			@confirm="confirm5" @cancel="show5=false"></u-picker>
+		<u-picker :show="show" :defaultIndex="defaultIndex1" class="my-picker" title="性别选择" aColor="#007AFF"
+			:columns="columns" confirmColor="#007AFF" @confirm="confirm1" @cancel="show=false"></u-picker>
+		<u-picker :show="show2" :defaultIndex="defaultIndex2" title="年龄选择" keyName="label" aColor="#007AFF"
+			:columns="columns2" confirmColor="#007AFF" @confirm="confirm2" @cancel="show2=false"></u-picker>
+		<u-picker :show="show3" :defaultIndex="defaultIndex3" title="星座选择" aColor="#007AFF" :columns="columns3"
+			confirmColor="#007AFF" @confirm="confirm3" @cancel="show3=false"></u-picker>
+		<u-picker :show="show4" :defaultIndex="defaultIndex4" title="班级选择" aColor="#007AFF" :columns="columns4"
+			confirmColor="#007AFF" @confirm="confirm4" @cancel="show4=false"></u-picker>
+
+		<!-- <u-picker keyName="name" :show="show5" title="选择主角" aColor="#007AFF" :columns="columns5" confirmColor="#007AFF"
+			@confirm="confirm5" @cancel="show5=false"></u-picker> -->
 	</view>
 </template>
 
@@ -131,7 +131,16 @@
 				roleInfo: null,
 				type: 0,
 
-				roleId: -1
+				roleId: -1,
+
+
+
+
+
+				defaultIndex1: [0],
+				defaultIndex2: [0],
+				defaultIndex3: [0],
+				defaultIndex4: [0]
 			}
 		},
 		onLoad() {
@@ -146,11 +155,27 @@
 				getApp().roleInfo = null
 
 
+
+
+				// 回显选择器对应默认索引
+				this.reshowIndex()
+
 			} else {
 				this.reShow2()
 			}
 		},
 		methods: {
+			reshowIndex() {
+				this.defaultIndex1[0] = this.roleInfo.sex == '男孩' ? 0 : 1
+				this.defaultIndex2[0] = Number(this.roleInfo.age) - 1
+
+				let xinzuoIndex = this.columns3[0].findIndex((item, index) => {
+					return item == this.roleInfo.star
+				})
+				console.log('xinzuoIndex-----', xinzuoIndex);
+				this.defaultIndex3[0] = xinzuoIndex
+				this.defaultIndex4[0] = Number(this.roleInfo.level)
+			},
 
 			reShow2() {
 				// 回显方式2

+ 21 - 3
pages/my/tuiguangDashi/index.vue

xqd xqd xqd
@@ -14,7 +14,8 @@
 					</view>
 				</view>
 				<view class="bot2">
-					入驻说明,加入分销商需要沟通买399年卡会员,联系客服开通
+					<!-- 入驻说明,加入分销商需要沟通买399年卡会员,联系客服开通 -->
+					{{sm}}
 				</view>
 			</view>
 
@@ -60,6 +61,8 @@
 	// import navBar from '@/components/navBar/index.vue'
 	import {
 		postZhaomu,
+
+		getPosterBg
 	} from '@/api/index/index.js'
 	export default {
 		// components: {
@@ -72,13 +75,28 @@
 					name: '',
 					phone: ''
 				},
-				value: true
+				value: true,
+
+				sm: ''
 			}
 		},
 		onLoad() {
-
+			this.tuiguangSm()
 		},
 		methods: {
+			async tuiguangSm() {
+				let res1 = await getPosterBg({
+					key: 'desc_share'
+				})
+				console.log('推广说明返回值--------2', res1);
+				if (res1.code == 0) {
+					this.sm = res1.data.value
+
+				} else {
+					this.$toast(res1.message)
+				}
+			},
+
 			async apply() {
 				let phoneReg = /^[1][3,4,5,7,8,9][0-9]{9}$/
 				if (!this.formData.name) {

文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/main.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/runtime.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/common/vendor.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/navBar/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/privacyPopup/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/tabBar/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/components/wike-painter/wike-painter.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/filePre/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/genHuiBen/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/genRes/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/aboutUs/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/cash/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/cashRecord/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/charge/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/huiBen_record/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/jiangli/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/kefu/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/myRecord/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/protocol/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/pubCenter/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/roleManage/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/roleManageDetail/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/team/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/tuiguangDashi/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/tuiguangHaibao/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/userInfo/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/pages/my/yongjinDetail/index.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-empty/u-empty.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line-progress/u-line-progress.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-line/u-line.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loading-icon/u-loading-icon.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-loadmore/u-loadmore.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-modal/u-modal.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-overlay/u-overlay.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-parse/node/node.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-parse/u-parse.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-picker/u-picker.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-popup/u-popup.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-safe-bottom/u-safe-bottom.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-status-bar/u-status-bar.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swiper-indicator/u-swiper-indicator.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-swiper/u-swiper.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-tabs/u-tabs.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-toolbar/u-toolbar.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-transition/u-transition.js.map


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/.sourcemap/mp-weixin/uni_modules/uview-ui/components/u-upload/u-upload.js.map


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

xqd
@@ -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 */ 330));
+    return resolve(__webpack_require__(/*! @/components/navBar/index.vue */ 346));
   }).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 */ 337));
+    return resolve(__webpack_require__(/*! @/components/tabBar/index.vue */ 353));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 _vue.default.component('navBar', navBar);

文件差異過大導致無法顯示
+ 1 - 1
unpackage/dist/dev/mp-weixin/common/runtime.js


+ 226 - 210
unpackage/dist/dev/mp-weixin/common/vendor.js

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.warn('根据 Vue 的 data 函数初始化小程序 data 失败,请尽量确保 data 函数中不访问 vm 对象,否则可能影响首次数据渲染速度。', data);
       }
     }
@@ -8934,7 +8934,7 @@ function type(obj) {
 
 function flushCallbacks$1(vm) {
     if (vm.__next_tick_callbacks && vm.__next_tick_callbacks.length) {
-        if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+        if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:flushCallbacks[' + vm.__next_tick_callbacks.length + ']');
@@ -8955,14 +8955,14 @@ function nextTick$1(vm, cb) {
     //1.nextTick 之前 已 setData 且 setData 还未回调完成
     //2.nextTick 之前存在 render watcher
     if (!vm.__next_tick_pending && !hasRenderWatcher(vm)) {
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + vm._uid +
                 ']:nextVueTick');
         }
         return nextTick(cb, vm)
     }else{
-        if(Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG){
+        if(Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG){
             var mpInstance$1 = vm.$scope;
             console.log('[' + (+new Date) + '][' + (mpInstance$1.is || mpInstance$1.route) + '][' + vm._uid +
                 ']:nextMPTick');
@@ -9058,7 +9058,7 @@ var patch = function(oldVnode, vnode) {
     });
     var diffData = this.$shouldDiffData === false ? data : diff(data, mpData);
     if (Object.keys(diffData).length) {
-      if (Object({"VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","NODE_ENV":"development","BASE_URL":"/"}).VUE_APP_DEBUG) {
+      if (Object({"NODE_ENV":"development","VUE_APP_DARK_MODE":"false","VUE_APP_NAME":"huiben","VUE_APP_PLATFORM":"mp-weixin","BASE_URL":"/"}).VUE_APP_DEBUG) {
         console.log('[' + (+new Date) + '][' + (mpInstance.is || mpInstance.route) + '][' + this._uid +
           ']差量更新',
           JSON.stringify(diffData));
@@ -21407,7 +21407,23 @@ module.exports = function (vm) {
 /* 346 */,
 /* 347 */,
 /* 348 */,
-/* 349 */
+/* 349 */,
+/* 350 */,
+/* 351 */,
+/* 352 */,
+/* 353 */,
+/* 354 */,
+/* 355 */,
+/* 356 */,
+/* 357 */,
+/* 358 */,
+/* 359 */,
+/* 360 */,
+/* 361 */,
+/* 362 */,
+/* 363 */,
+/* 364 */,
+/* 365 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-swiper/props.js ***!
   \******************************************************************************/
@@ -21550,14 +21566,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 350 */,
-/* 351 */,
-/* 352 */,
-/* 353 */,
-/* 354 */,
-/* 355 */,
-/* 356 */,
-/* 357 */
+/* 366 */,
+/* 367 */,
+/* 368 */,
+/* 369 */,
+/* 370 */,
+/* 371 */,
+/* 372 */,
+/* 373 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-empty/props.js ***!
   \*****************************************************************************/
@@ -21634,14 +21650,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 358 */,
-/* 359 */,
-/* 360 */,
-/* 361 */,
-/* 362 */,
-/* 363 */,
-/* 364 */,
-/* 365 */
+/* 374 */,
+/* 375 */,
+/* 376 */,
+/* 377 */,
+/* 378 */,
+/* 379 */,
+/* 380 */,
+/* 381 */
 /*!********************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-loadmore/props.js ***!
   \********************************************************************************/
@@ -21753,21 +21769,21 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 366 */,
-/* 367 */,
-/* 368 */,
-/* 369 */,
-/* 370 */,
-/* 371 */,
-/* 372 */,
-/* 373 */,
-/* 374 */,
-/* 375 */,
-/* 376 */,
-/* 377 */,
-/* 378 */,
-/* 379 */,
-/* 380 */
+/* 382 */,
+/* 383 */,
+/* 384 */,
+/* 385 */,
+/* 386 */,
+/* 387 */,
+/* 388 */,
+/* 389 */,
+/* 390 */,
+/* 391 */,
+/* 392 */,
+/* 393 */,
+/* 394 */,
+/* 395 */,
+/* 396 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-upload/utils.js ***!
   \******************************************************************************/
@@ -21911,7 +21927,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"]))
 
 /***/ }),
-/* 381 */
+/* 397 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-upload/mixin.js ***!
   \******************************************************************************/
@@ -21938,7 +21954,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 382 */
+/* 398 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-upload/props.js ***!
   \******************************************************************************/
@@ -22080,14 +22096,14 @@ 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 */
+/* 399 */,
+/* 400 */,
+/* 401 */,
+/* 402 */,
+/* 403 */,
+/* 404 */,
+/* 405 */,
+/* 406 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-picker/props.js ***!
   \******************************************************************************/
@@ -22192,14 +22208,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 391 */,
-/* 392 */,
-/* 393 */,
-/* 394 */,
-/* 395 */,
-/* 396 */,
-/* 397 */,
-/* 398 */
+/* 407 */,
+/* 408 */,
+/* 409 */,
+/* 410 */,
+/* 411 */,
+/* 412 */,
+/* 413 */,
+/* 414 */
 /*!*************************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-line-progress/props.js ***!
   \*************************************************************************************/
@@ -22245,14 +22261,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 399 */,
-/* 400 */,
-/* 401 */,
-/* 402 */,
-/* 403 */,
-/* 404 */,
-/* 405 */,
-/* 406 */
+/* 415 */,
+/* 416 */,
+/* 417 */,
+/* 418 */,
+/* 419 */,
+/* 420 */,
+/* 421 */,
+/* 422 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-parse/props.js ***!
   \*****************************************************************************/
@@ -22312,7 +22328,7 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 407 */
+/* 423 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-parse/parser.js ***!
   \******************************************************************************/
@@ -23243,14 +23259,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"]))
 
 /***/ }),
-/* 408 */,
-/* 409 */,
-/* 410 */,
-/* 411 */,
-/* 412 */,
-/* 413 */,
-/* 414 */,
-/* 415 */
+/* 424 */,
+/* 425 */,
+/* 426 */,
+/* 427 */,
+/* 428 */,
+/* 429 */,
+/* 430 */,
+/* 431 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-modal/props.js ***!
   \*****************************************************************************/
@@ -23352,14 +23368,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 416 */,
-/* 417 */,
-/* 418 */,
-/* 419 */,
-/* 420 */,
-/* 421 */,
-/* 422 */,
-/* 423 */
+/* 432 */,
+/* 433 */,
+/* 434 */,
+/* 435 */,
+/* 436 */,
+/* 437 */,
+/* 438 */,
+/* 439 */
 /*!****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-icon/icons.js ***!
   \****************************************************************************/
@@ -23590,7 +23606,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 424 */
+/* 440 */
 /*!****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-icon/props.js ***!
   \****************************************************************************/
@@ -23697,14 +23713,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 425 */,
-/* 426 */,
-/* 427 */,
-/* 428 */,
-/* 429 */,
-/* 430 */,
-/* 431 */,
-/* 432 */
+/* 441 */,
+/* 442 */,
+/* 443 */,
+/* 444 */,
+/* 445 */,
+/* 446 */,
+/* 447 */,
+/* 448 */
 /*!***********************************************************************!*\
   !*** D:/desktop/huibenPro/components/wike-painter/common/relation.js ***!
   \***********************************************************************/
@@ -23871,7 +23887,7 @@ function children(parent) {
 }
 
 /***/ }),
-/* 433 */
+/* 449 */
 /*!*************************************************************!*\
   !*** D:/desktop/huibenPro/components/wike-painter/props.js ***!
   \*************************************************************/
@@ -23927,7 +23943,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 434 */
+/* 450 */
 /*!*************************************************************!*\
   !*** D:/desktop/huibenPro/components/wike-painter/utils.js ***!
   \*************************************************************/
@@ -24204,7 +24220,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"]))
 
 /***/ }),
-/* 435 */
+/* 451 */
 /*!***************************************************************!*\
   !*** D:/desktop/huibenPro/components/wike-painter/painter.js ***!
   \***************************************************************/
@@ -26289,14 +26305,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"]))
 
 /***/ }),
-/* 436 */,
-/* 437 */,
-/* 438 */,
-/* 439 */,
-/* 440 */,
-/* 441 */,
-/* 442 */,
-/* 443 */
+/* 452 */,
+/* 453 */,
+/* 454 */,
+/* 455 */,
+/* 456 */,
+/* 457 */,
+/* 458 */,
+/* 459 */
 /*!****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-tabs/props.js ***!
   \****************************************************************************/
@@ -26378,14 +26394,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 444 */,
-/* 445 */,
-/* 446 */,
-/* 447 */,
-/* 448 */,
-/* 449 */,
-/* 450 */,
-/* 451 */
+/* 460 */,
+/* 461 */,
+/* 462 */,
+/* 463 */,
+/* 464 */,
+/* 465 */,
+/* 466 */,
+/* 467 */
 /*!**********************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/libs/mixin/button.js ***!
   \**********************************************************************/
@@ -26415,7 +26431,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 452 */
+/* 468 */
 /*!************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/libs/mixin/openType.js ***!
   \************************************************************************/
@@ -26457,7 +26473,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 453 */
+/* 469 */
 /*!******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-button/props.js ***!
   \******************************************************************************/
@@ -26636,14 +26652,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 454 */,
-/* 455 */,
-/* 456 */,
-/* 457 */,
-/* 458 */,
-/* 459 */,
-/* 460 */,
-/* 461 */
+/* 470 */,
+/* 471 */,
+/* 472 */,
+/* 473 */,
+/* 474 */,
+/* 475 */,
+/* 476 */,
+/* 477 */
 /*!********************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uni-icons/components/uni-icons/icons.js ***!
   \********************************************************************************/
@@ -27664,14 +27680,14 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 462 */,
-/* 463 */,
-/* 464 */,
-/* 465 */,
-/* 466 */,
-/* 467 */,
-/* 468 */,
-/* 469 */
+/* 478 */,
+/* 479 */,
+/* 480 */,
+/* 481 */,
+/* 482 */,
+/* 483 */,
+/* 484 */,
+/* 485 */
 /*!************************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-loading-icon/props.js ***!
   \************************************************************************************/
@@ -27748,14 +27764,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 470 */,
-/* 471 */,
-/* 472 */,
-/* 473 */,
-/* 474 */,
-/* 475 */,
-/* 476 */,
-/* 477 */
+/* 486 */,
+/* 487 */,
+/* 488 */,
+/* 489 */,
+/* 490 */,
+/* 491 */,
+/* 492 */,
+/* 493 */
 /*!****************************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-swiper-indicator/props.js ***!
   \****************************************************************************************/
@@ -27802,14 +27818,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 478 */,
-/* 479 */,
-/* 480 */,
-/* 481 */,
-/* 482 */,
-/* 483 */,
-/* 484 */,
-/* 485 */
+/* 494 */,
+/* 495 */,
+/* 496 */,
+/* 497 */,
+/* 498 */,
+/* 499 */,
+/* 500 */,
+/* 501 */
 /*!****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-line/props.js ***!
   \****************************************************************************/
@@ -27860,14 +27876,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 486 */,
-/* 487 */,
-/* 488 */,
-/* 489 */,
-/* 490 */,
-/* 491 */,
-/* 492 */,
-/* 493 */
+/* 502 */,
+/* 503 */,
+/* 504 */,
+/* 505 */,
+/* 506 */,
+/* 507 */,
+/* 508 */,
+/* 509 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-popup/props.js ***!
   \*****************************************************************************/
@@ -27964,14 +27980,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 494 */,
-/* 495 */,
-/* 496 */,
-/* 497 */,
-/* 498 */,
-/* 499 */,
-/* 500 */,
-/* 501 */
+/* 510 */,
+/* 511 */,
+/* 512 */,
+/* 513 */,
+/* 514 */,
+/* 515 */,
+/* 516 */,
+/* 517 */
 /*!*******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-toolbar/props.js ***!
   \*******************************************************************************/
@@ -28023,23 +28039,23 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 502 */,
-/* 503 */,
-/* 504 */,
-/* 505 */,
-/* 506 */,
-/* 507 */,
-/* 508 */,
-/* 509 */,
-/* 510 */,
-/* 511 */,
-/* 512 */,
-/* 513 */,
-/* 514 */,
-/* 515 */,
-/* 516 */,
-/* 517 */,
-/* 518 */
+/* 518 */,
+/* 519 */,
+/* 520 */,
+/* 521 */,
+/* 522 */,
+/* 523 */,
+/* 524 */,
+/* 525 */,
+/* 526 */,
+/* 527 */,
+/* 528 */,
+/* 529 */,
+/* 530 */,
+/* 531 */,
+/* 532 */,
+/* 533 */,
+/* 534 */
 /*!*****************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-badge/props.js ***!
   \*****************************************************************************/
@@ -28129,14 +28145,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 519 */,
-/* 520 */,
-/* 521 */,
-/* 522 */,
-/* 523 */,
-/* 524 */,
-/* 525 */,
-/* 526 */
+/* 535 */,
+/* 536 */,
+/* 537 */,
+/* 538 */,
+/* 539 */,
+/* 540 */,
+/* 541 */,
+/* 542 */
 /*!*******************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-overlay/props.js ***!
   \*******************************************************************************/
@@ -28178,14 +28194,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 527 */,
-/* 528 */,
-/* 529 */,
-/* 530 */,
-/* 531 */,
-/* 532 */,
-/* 533 */,
-/* 534 */
+/* 543 */,
+/* 544 */,
+/* 545 */,
+/* 546 */,
+/* 547 */,
+/* 548 */,
+/* 549 */,
+/* 550 */
 /*!**********************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-transition/props.js ***!
   \**********************************************************************************/
@@ -28227,7 +28243,7 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 535 */
+/* 551 */
 /*!***************************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-transition/transition.js ***!
   \***************************************************************************************/
@@ -28244,7 +28260,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 */ 536));
+var _nvueAniMap = _interopRequireDefault(__webpack_require__(/*! ./nvue.ani-map.js */ 552));
 // 定义一个一定时间后自动成功的promise,让调用nextTick方法处,进入下一个then方法
 var nextTick = function nextTick() {
   return new Promise(function (resolve) {
@@ -28336,7 +28352,7 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 536 */
+/* 552 */
 /*!*****************************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-transition/nvue.ani-map.js ***!
   \*****************************************************************************************/
@@ -28529,14 +28545,14 @@ var _default = {
 exports.default = _default;
 
 /***/ }),
-/* 537 */,
-/* 538 */,
-/* 539 */,
-/* 540 */,
-/* 541 */,
-/* 542 */,
-/* 543 */,
-/* 544 */
+/* 553 */,
+/* 554 */,
+/* 555 */,
+/* 556 */,
+/* 557 */,
+/* 558 */,
+/* 559 */,
+/* 560 */
 /*!**********************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-status-bar/props.js ***!
   \**********************************************************************************/
@@ -28562,14 +28578,14 @@ exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 2)["default"]))
 
 /***/ }),
-/* 545 */,
-/* 546 */,
-/* 547 */,
-/* 548 */,
-/* 549 */,
-/* 550 */,
-/* 551 */,
-/* 552 */
+/* 561 */,
+/* 562 */,
+/* 563 */,
+/* 564 */,
+/* 565 */,
+/* 566 */,
+/* 567 */,
+/* 568 */
 /*!***********************************************************************************!*\
   !*** D:/desktop/huibenPro/uni_modules/uview-ui/components/u-safe-bottom/props.js ***!
   \***********************************************************************************/

文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/components/navBar/index.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/components/privacyPopup/index.js


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

xqd
@@ -1,6 +1,6 @@
 {
+  "component": true,
   "usingComponents": {
     "u-popup": "/uni_modules/uview-ui/components/u-popup/u-popup"
-  },
-  "component": true
+  }
 }

文件差異過大導致無法顯示
+ 11 - 11
unpackage/dist/dev/mp-weixin/components/tabBar/index.js


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

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -1,6 +1,6 @@
 (global["webpackJsonp"] = global["webpackJsonp"] || []).push([["components/wike-painter/wike-painter"],{
 
-/***/ 427:
+/***/ 443:
 /*!*********************************************************************!*\
   !*** 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& */ 428);
-/* 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& */ 430);
+/* 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& */ 444);
+/* 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& */ 446);
 /* 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& */ 436);
+/* 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& */ 452);
 /* 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"
 
 /***/ }),
 
-/***/ 428:
+/***/ 444:
 /*!****************************************************************************************************!*\
   !*** 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& */ 429);
+/* 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& */ 445);
 /* 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__);
 
 /***/ }),
 
-/***/ 429:
+/***/ 445:
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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
 
 /***/ }),
 
-/***/ 430:
+/***/ 446:
 /*!**********************************************************************************************!*\
   !*** 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& */ 431);
+/* 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& */ 447);
 /* 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); 
 
 /***/ }),
 
-/***/ 431:
+/***/ 447:
 /*!*****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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 */ 432);
-var _props = _interopRequireDefault(__webpack_require__(/*! ./props */ 433));
-var _utils = __webpack_require__(/*! ./utils */ 434);
-var _painter = _interopRequireDefault(__webpack_require__(/*! ./painter */ 435));
+var _relation = __webpack_require__(/*! ./common/relation */ 448);
+var _props = _interopRequireDefault(__webpack_require__(/*! ./props */ 449));
+var _utils = __webpack_require__(/*! ./utils */ 450);
+var _painter = _interopRequireDefault(__webpack_require__(/*! ./painter */ 451));
 //
 //
 //
@@ -690,7 +690,7 @@ exports.default = _default;
 
 /***/ }),
 
-/***/ 436:
+/***/ 452:
 /*!******************************************************************************************************!*\
   !*** 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& */ 437);
+/* 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& */ 453);
 /* 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); 
 
 /***/ }),
 
-/***/ 437:
+/***/ 453:
 /*!**********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** ./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__(427))
+            __webpack_require__('2')['createComponent'](__webpack_require__(443))
         })
     },
     [['components/wike-painter/wike-painter-create-component']]

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

xqd xqd xqd xqd
@@ -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 */ 375))
+      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 */ 391))
     },
     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 */ 385))
+      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 */ 401))
     },
   }
 } catch (e) {
@@ -243,7 +243,8 @@ var _default = {
   onLoad: function onLoad() {
     this.getUserInfo();
     this.getRoleparmas();
-    this.reShow2();
+
+    // this.reShow2()
   },
   onShow: function onShow() {
     // if (getApp().refreshRole) {
@@ -412,7 +413,7 @@ var _default = {
     getRoleparmas: function getRoleparmas() {
       var _this3 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var res1;
+        var res1, i;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
@@ -433,20 +434,18 @@ var _default = {
                     _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
+                    i = 0;
+                    _this3.oldSeledRole = res1.data.data[i];
+                    _this3.roleId = res1.data.data[i].id;
+                    _this3.formData.nickName = res1.data.data[i].name;
+                    _this3.formData.sex = res1.data.data[i].sex;
+                    _this3.formData.age = res1.data.data[i].age;
+                    _this3.formData.ageName = _this3.columns2[0][Number(res1.data.data[i].age) - 1];
+                    _this3.formData.star = res1.data.data[i].star;
+                    _this3.formData.className = _this3.columns4[0][Number(res1.data.data[i].level)];
+                    _this3.formData.class = res1.data.data[i].level;
                   } else {
+                    _this3.reShow2();
                     _this3.columns5[0] = ['暂无'];
                   }
                   // this.chargeList=[]

+ 4 - 2
unpackage/dist/dev/mp-weixin/pages/index/genHuiBen/index.wxss

xqd
@@ -215,18 +215,20 @@ view.data-v-78ae4888 {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding-left: 66rpx;
   padding-right: 30rpx;
 }
 .btnBox .left.data-v-78ae4888 {
   display: flex;
   flex-direction: column;
   justify-content: center;
-  align-items: center;
+  align-items: flex-start;
   font-size: 20rpx;
   font-family: PingFang-SC, PingFang-SC;
   font-weight: 500;
   color: #333333;
+  height: 108rpx;
+  width: calc(100% - 552rpx);
+  padding-left: 66rpx;
 }
 .btnBox .left .kfIcon.data-v-78ae4888 {
   width: 38rpx;

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

xqd xqd xqd xqd
@@ -101,13 +101,13 @@ 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 */ 393))
+      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 */ 409))
     },
     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 */ 401))
+      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 */ 417))
     },
     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 */ 410))
+      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 */ 426))
     },
   }
 } catch (e) {
@@ -278,8 +278,11 @@ var _default = {
       // this.showLoading = false
       // this.huibenDetail = getApp().huibenDetail
 
+      var firstImg = "<img src=\"".concat(getApp().huibenDetail.image, "\"/>");
+      getApp().huibenDetail.pinyin_content = firstImg + getApp().huibenDetail.pinyin_content;
       this.huibenRes = getApp().huibenDetail;
-      this.content = "".concat(getApp().huibenDetail.pinyin_content);
+      console.log('this.huibenRes', this.huibenRes);
+      // this.content = `${getApp().huibenDetail.pinyin_content}`
 
       // setTimeout(() => {
       // 	this.showLoading = false
@@ -437,7 +440,7 @@ var _default = {
     getGenRes: function getGenRes() {
       var _this5 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var res1;
+        var res1, firstImg;
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
@@ -463,8 +466,9 @@ var _default = {
                   } else if (res1.data.state == 5) {
                     _this5.percentage = 80;
                   } else if (res1.data.state == 6) {
+                    firstImg = "<img src=\"".concat(res1.data.image, "\"/>");
+                    res1.data.pinyin_content = firstImg + res1.data.pinyin_content;
                     _this5.huibenRes = res1.data;
-                    _this5.content = "".concat(res1.data.pinyin_content);
                     _this5.percentage = 99;
                     // this.showLoading = false
                     clearInterval(_this5.timer);

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

xqd xqd
@@ -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 */ 344))
+      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 */ 360))
     },
     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 */ 352))
+      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 */ 368))
     },
     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 */ 360))
+      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 */ 376))
     },
   }
 } 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 */ 595));
+    return resolve(__webpack_require__(/*! @/components/privacyPopup/index.vue */ 384));
   }).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
 };
 var _default = {

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

xqd
@@ -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 */ 401))
+      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 */ 417))
     },
   }
 } catch (e) {

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

xqd
@@ -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 */ 385))
+      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 */ 401))
     },
   }
 } catch (e) {

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

xqd
@@ -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 */ 352))
+      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 */ 368))
     },
   }
 } catch (e) {

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

xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd xqd
@@ -101,7 +101,10 @@ 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 */ 352))
+      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 */ 368))
+    },
+    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 */ 426))
     },
   }
 } catch (e) {
@@ -167,7 +170,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", {
@@ -213,6 +216,18 @@ var _index = __webpack_require__(/*! @/api/index/index.js */ 163);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
   // components: {
@@ -221,14 +236,35 @@ var _default = {
   data: function data() {
     return {
       picBase: this.$picBase2,
-      cusumerList: []
+      cusumerList: [],
+      huibenItem: null,
+      tempPdfile: '',
+      showLead: false
     };
   },
   onLoad: function onLoad() {
     this.getConsumerRecord();
   },
   methods: {
-    downPdf: function downPdf(id) {
+    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"
+          });
+        }
+      });
+    },
+    downPdf: function downPdf(id, item) {
       var _this2 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var res1;
@@ -236,13 +272,14 @@ var _default = {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                _this2.huibenItem = item;
                 console.log('downPdf-------------');
-                _context.next = 3;
+                _context.next = 4;
                 return (0, _index.genPdf)({
                   // id:this.taskId
                   id: id
                 });
-              case 3:
+              case 4:
                 res1 = _context.sent;
                 console.log('获取pdfurl返回值--------2', res1);
                 if (res1.code == 0) {
@@ -251,7 +288,7 @@ var _default = {
                 } else {
                   _this2.$toast(res1.message);
                 }
-              case 6:
+              case 7:
               case "end":
                 return _context.stop();
             }
@@ -266,9 +303,10 @@ var _default = {
       });
     },
     download: function download(file, type) {
+      var _this3 = this;
       var _this = this;
       uni.showLoading({
-        title: '下载中'
+        title: '生成中'
       });
       //下载文件
       uni.downloadFile({
@@ -287,28 +325,33 @@ var _default = {
             //保存成功之后 打开文件
             uni.getFileSystemManager().saveFile({
               tempFilePath: tempFile,
-              // filePath: wx.env.USER_DATA_PATH + '/' + '上传成员.pdf',//自定义文件名
+              filePath: wx.env.USER_DATA_PATH + '/' + _this3.huibenItem.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;
+                // uni.openDocument({
+                // 	filePath: res.savedFilePath,
+                // 	showMenu: true, //是否可以分享
+                // 	success: (res) => {
+                // 		uni.hideLoading()
+
+                // 		console.log(res);
+                // 	},
+                // 	fail: (e) => {
+                // 		uni.showToast({
+                // 			title: '打开失败',
+                // 			icon: "error"
+                // 		})
+                // 	}
+                // })
               }
             });
           }
         },
+
         fail: function fail(e) {
           console.log(e, '文件下载失败');
           uni.showToast({
@@ -319,7 +362,7 @@ var _default = {
       });
     },
     getConsumerRecord: function getConsumerRecord() {
-      var _this3 = this;
+      var _this4 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var res1;
         return _regenerator.default.wrap(function _callee2$(_context2) {
@@ -332,10 +375,10 @@ var _default = {
                 res1 = _context2.sent;
                 console.log('绘画记录返回值--------2', res1);
                 if (res1.code == 0) {
-                  _this3.cusumerList = res1.data.data;
+                  _this4.cusumerList = res1.data.data;
                   // this.cusumerList = [1]
                 } else {
-                  _this3.$toast(res1.message);
+                  _this4.$toast(res1.message);
                 }
               case 5:
               case "end":
@@ -348,7 +391,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"]))
 
 /***/ }),
 

+ 2 - 1
unpackage/dist/dev/mp-weixin/pages/my/huiBen_record/index.json

xqd
@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "绘本记录",
   "usingComponents": {
-    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty"
+    "u-empty": "/uni_modules/uview-ui/components/u-empty/u-empty",
+    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal"
   }
 }

文件差異過大導致無法顯示
+ 0 - 1
unpackage/dist/dev/mp-weixin/pages/my/huiBen_record/index.wxml


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

xqd xqd xqd xqd xqd
@@ -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 */ 352))
+      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 */ 368))
     },
   }
 } catch (e) {
@@ -265,6 +265,12 @@ var _index = __webpack_require__(/*! @/api/index/index.js */ 163);
 //
 //
 //
+//
+//
+//
+//
+//
+//
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
   // components: {
@@ -277,7 +283,8 @@ var _default = {
         data: []
       },
       shareTitle: null,
-      shareImg: ''
+      shareImg: '',
+      sm: ''
     };
   },
   onLoad: function onLoad() {
@@ -299,7 +306,7 @@ var _default = {
     getShare: function getShare() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var res1, res2;
+        var res1, res2, res3;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -328,9 +335,21 @@ var _default = {
                 } else {
                   _this.$toast(res2.message);
                 }
+                _context.next = 12;
+                return (0, _index.getPosterBg)({
+                  key: 'push_promotion'
+                });
+              case 12:
+                res3 = _context.sent;
+                console.log('奖励说明返回值--------2', res3);
+                if (res3.code == 0) {
+                  _this.sm = res3.data.value;
+                } else {
+                  _this.$toast(res3.message);
+                }
 
                 // 
-              case 10:
+              case 15:
               case "end":
                 return _context.stop();
             }

文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/my/jiangli/index.wxml


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

xqd xqd
@@ -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 */ 446))
+      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 */ 462))
     },
   }
 } catch (e) {
@@ -238,7 +238,7 @@ var _default = {
                 if (res1.code == 0) {
                   _this.phone = res1.data.service_phone.value;
                   _this.weiChat = res1.data.service_wx.value;
-                  _this.code = res1.data.service_qrcode.value;
+                  _this.code = _this.$ossBaseUrl + res1.data.service_qrcode.value;
                   console.log(_this.phone, _this.weiChat, _this.code);
                 } else {
                   _this.$toast(res1.message);

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

xqd
@@ -101,10 +101,10 @@ var components
 try {
   components = {
     uTabs: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabs/u-tabs.vue */ 438))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-tabs/u-tabs */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-tabs/u-tabs")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-tabs/u-tabs.vue */ 454))
     },
     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 */ 352))
+      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 */ 368))
     },
   }
 } catch (e) {

+ 5 - 3
unpackage/dist/dev/mp-weixin/pages/my/protocol/index.js

xqd xqd
@@ -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 */ 401))
+      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 */ 417))
     },
   }
 } catch (e) {
@@ -243,12 +243,14 @@ var _default = {
                 break;
               case 16:
                 _context.next = 18;
-                return (0, _index.getKefu)();
+                return (0, _index.getPosterBg)({
+                  key: 'agreement_share'
+                });
               case 18:
                 _res2 = _context.sent;
                 console.log('推广协议返回值--------2', _res2);
                 if (_res2.code == 0) {
-                  _this.content = _res2.data.push.value;
+                  _this.content = _res2.data.value;
                 } else {
                   _this.$toast(_res2.message);
                 }

文件差異過大導致無法顯示
+ 15 - 14
unpackage/dist/dev/mp-weixin/pages/my/roleManage/index.js


文件差異過大導致無法顯示
+ 63 - 48
unpackage/dist/dev/mp-weixin/pages/my/roleManageDetail/index.js


文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/my/roleManageDetail/index.wxml


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

xqd
@@ -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 */ 352))
+      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 */ 368))
     },
   }
 } catch (e) {

+ 58 - 26
unpackage/dist/dev/mp-weixin/pages/my/tuiguangDashi/index.js

xqd xqd xqd xqd
@@ -101,7 +101,7 @@ var components
 try {
   components = {
     uIcon: function () {
-      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-icon/u-icon.vue */ 418))
+      return Promise.all(/*! import() | uni_modules/uview-ui/components/u-icon/u-icon */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-icon/u-icon")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-icon/u-icon.vue */ 434))
     },
   }
 } catch (e) {
@@ -231,6 +231,7 @@ var _index = __webpack_require__(/*! @/api/index/index.js */ 163);
 //
 //
 //
+//
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
   // components: {
@@ -243,59 +244,90 @@ var _default = {
         name: '',
         phone: ''
       },
-      value: true
+      value: true,
+      sm: ''
     };
   },
-  onLoad: function onLoad() {},
+  onLoad: function onLoad() {
+    this.tuiguangSm();
+  },
   methods: {
-    apply: function apply() {
+    tuiguangSm: function tuiguangSm() {
       var _this = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var phoneReg, res1;
+        var res1;
         return _regenerator.default.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return (0, _index.getPosterBg)({
+                  key: 'desc_share'
+                });
+              case 2:
+                res1 = _context.sent;
+                console.log('推广说明返回值--------2', res1);
+                if (res1.code == 0) {
+                  _this.sm = res1.data.value;
+                } else {
+                  _this.$toast(res1.message);
+                }
+              case 5:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    },
+    apply: function apply() {
+      var _this2 = this;
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var phoneReg, res1;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 phoneReg = /^[1][3,4,5,7,8,9][0-9]{9}$/;
-                if (_this.formData.name) {
-                  _context.next = 3;
+                if (_this2.formData.name) {
+                  _context2.next = 3;
                   break;
                 }
-                return _context.abrupt("return", _this.$toast('请输入姓名'));
+                return _context2.abrupt("return", _this2.$toast('请输入姓名'));
               case 3:
-                if (_this.formData.phone) {
-                  _context.next = 5;
+                if (_this2.formData.phone) {
+                  _context2.next = 5;
                   break;
                 }
-                return _context.abrupt("return", _this.$toast('请输入手机号'));
+                return _context2.abrupt("return", _this2.$toast('请输入手机号'));
               case 5:
-                if (phoneReg.test(_this.formData.phone)) {
-                  _context.next = 7;
+                if (phoneReg.test(_this2.formData.phone)) {
+                  _context2.next = 7;
                   break;
                 }
-                return _context.abrupt("return", _this.$toast('请输入合法的手机号'));
+                return _context2.abrupt("return", _this2.$toast('请输入合法的手机号'));
               case 7:
-                if (_this.value) {
-                  _context.next = 9;
+                if (_this2.value) {
+                  _context2.next = 9;
                   break;
                 }
-                return _context.abrupt("return", _this.$toast('请同意协议'));
+                return _context2.abrupt("return", _this2.$toast('请同意协议'));
               case 9:
-                console.log('form', _this.formData);
+                console.log('form', _this2.formData);
                 // let p = {}
-                _context.next = 12;
-                return (0, _index.postZhaomu)(_this.formData);
+                _context2.next = 12;
+                return (0, _index.postZhaomu)(_this2.formData);
               case 12:
-                res1 = _context.sent;
+                res1 = _context2.sent;
                 console.log('申请推广大使返回值--------2', res1);
-                _this.$toast('申请成功', 'success');
+                _this2.$toast('申请成功', 'success');
                 // return setTimeout(() => {
                 // 	uni.reLaunch({
                 // 		url: '/pages/my/index'
                 // 	})
                 // }, 1500)
                 if (res1.code == 0) {
-                  _this.$toast('申请成功', 'success');
+                  _this2.$toast('申请成功', 'success');
                   // uni.showToast({
                   // 	title:'申请成功'
                   // })
@@ -306,14 +338,14 @@ var _default = {
                   }, 1500);
                   // console.log('list1', this.list1);
                 } else {
-                  _this.$toast(res1.message);
+                  _this2.$toast(res1.message);
                 }
               case 16:
               case "end":
-                return _context.stop();
+                return _context2.stop();
             }
           }
-        }, _callee);
+        }, _callee2);
       }))();
     },
     toProtocol: function toProtocol() {

文件差異過大導致無法顯示
+ 0 - 0
unpackage/dist/dev/mp-weixin/pages/my/tuiguangDashi/index.wxml


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

xqd
@@ -101,7 +101,7 @@ var components
 try {
   components = {
     wikePainter: function () {
-      return Promise.all(/*! import() | components/wike-painter/wike-painter */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/wike-painter/wike-painter")]).then(__webpack_require__.bind(null, /*! @/components/wike-painter/wike-painter.vue */ 427))
+      return Promise.all(/*! import() | components/wike-painter/wike-painter */[__webpack_require__.e("common/vendor"), __webpack_require__.e("components/wike-painter/wike-painter")]).then(__webpack_require__.bind(null, /*! @/components/wike-painter/wike-painter.vue */ 443))
     },
   }
 } catch (e) {

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

xqd
@@ -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 */ 352))
+      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 */ 368))
     },
   }
 } catch (e) {

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

xqd
@@ -15,22 +15,15 @@
           "scene": null
         },
         {
-          "name": "主角列表",
+          "name": "主角管理",
           "pathName": "pages/my/roleManage/index",
           "query": "",
           "launchMode": "default",
           "scene": null
         },
         {
-          "name": "我的",
-          "pathName": "pages/my/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
-          "name": "绘本参数",
-          "pathName": "pages/index/genHuiBen/index",
+          "name": "绘本记录",
+          "pathName": "pages/my/huiBen_record/index",
           "query": "",
           "launchMode": "default",
           "scene": null

文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/uni_modules/uni-icons/components/uni-icons/uni-icons.js


文件差異過大導致無法顯示
+ 12 - 12
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-badge/u-badge.js


文件差異過大導致無法顯示
+ 16 - 16
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-button/u-button.js


文件差異過大導致無法顯示
+ 13 - 13
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-empty/u-empty.js


文件差異過大導致無法顯示
+ 13 - 13
unpackage/dist/dev/mp-weixin/uni_modules/uview-ui/components/u-icon/u-icon.js


部分文件因文件數量過多而無法顯示