1.3

pages/index/genHuiBen/index.scss

@@ -49,6 +49,8 @@
 	background-size: cover;
 	background-repeat: no-repeat;
 	
+	box-shadow: 0rpx -2rpx 20rpx 0rpx rgba(0,0,0,0.05);
+	
 	.left{
 		.aiIcon{
 			// width: 62rpx;
@@ -60,7 +62,7 @@
 		}
 	}
 	.right{
-		margin-left: 15rpx;
+		margin-left: -5rpx;
 		.label1{
 			// font-size: 40rpx;
 			// font-family: DOUYUFont;
@@ -75,12 +77,13 @@
 			font-weight: bold;
 			color: #FFFFFF;
 			text-shadow: 0px 4px 8px rgba(0,67,181,0.16);
+			padding-left: 6rpx;
 		}
 	}
 		}
 		
 		.mainBox{
-			margin-top: 52rpx;
+			margin-top:40rpx;
 			padding: 0 30rpx;
 			.titleBox{
 				background: #F0F1F4;

pages/index/genRes/index.vue

@@ -28,7 +28,7 @@
 					</view>
 
 
-					<u-parse :content="huibenRes.pinyin_content" @ready="loaded"></u-parse>
+					<u-parse :content="content" @ready="loaded"></u-parse>
 				</view>
 
 			</view>
@@ -111,23 +111,22 @@
 						console.log('this.percentage', this.percentage);
 					}
 				}, 1000)
+				console.log('接收的绘本详情', getApp().huibenDetail);
 
-				// 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
+				let firstImg = `<img src="${getApp().huibenDetail.image}"/>`
 
-				console.log('this.huibenRes', this.huibenRes);
-				// this.content = `${getApp().huibenDetail.pinyin_content}`
+				this.content = firstImg + getApp().huibenDetail.pinyin_content
+				getApp().huibenDetail = null
 
-				// setTimeout(() => {
-				// 	this.showLoading = false
-				// }, 5000);
+				// let pinyin_content = getApp().huibenDetail.pinyin_content
+				// pinyin_content.replace(firstImg, '')
+				// getApp().huibenDetail = null
+				// huibenInfo.pinyin_content = firstImg + pinyin_content
+				// this.huibenRes = huibenInfo
+
+				console.log('this.content', this.content);
 
-				console.log('接收的绘本详情', getApp().huibenDetail);
-				getApp().huibenDetail = null
 			}
 
 		},
@@ -259,7 +258,9 @@
 			},
 
 			onBack() {
-				getApp().refreshRole = true
+				this.huibenRes = null
+
+				// getApp().refreshRole = true
 
 				console.log('onBack()-----------');
 				if (this.timer) {
@@ -285,10 +286,9 @@
 					} else if (res1.data.state == 5) {
 						this.percentage = 80
 					} else if (res1.data.state == 6) {
-
-						let firstImg = `<img src="${res1.data.image}"/>`
-						res1.data.pinyin_content = firstImg + res1.data.pinyin_content
 						this.huibenRes = res1.data
+						let firstImg = `<img src="${res1.data.image}"/>`
+						this.content = firstImg + res1.data.pinyin_content
 						this.percentage = 99
 						// this.showLoading = false
 						clearInterval(this.timer)

pages/index/genRes/util.scss

@@ -50,7 +50,11 @@
 		
 		::v-deep ._img{
 			height: 600rpx!important;
+			// height: auto!important;
+			// min-height: 600rpx!important;
 			display: block!important;
 			width: 100%!important;
 			border-radius: 30rpx;
+			
+			// aspect-ratio: 1/1!important;
 		}

pages/index/index.scss

@@ -17,6 +17,45 @@
 	position: relative;
 	z-index: 0;
 	
+	.swiperDot {
+		
+		z-index: 999999999;
+		bottom: 72rpx;
+		position: absolute;
+		// background: red;
+	    margin-left: 50%;
+	    transform: translateX(-50%);
+	    display: flex;
+	    justify-content: center;
+	    min-width: 30px;
+	
+	    // margin-top: 18rpx;
+	    // padding-top: 20rpx;
+		
+		// background: red;
+		height: 10rpx;
+		display: flex;
+		align-items: center;
+	
+	    .dot {
+	      width: 14rpx;
+	      height: 10rpx;
+	      background-color: #333333;
+	      transform: skew(-10deg);
+	      margin: 0 4rpx;
+	      border-radius: 2rpx;
+	    }
+	
+	    .dotA {
+	      width: 14rpx;
+	      height: 10rpx;
+	      transform: skew(-10deg);
+	      margin: 0 4rpx;
+	      border-radius: 2rpx;
+	      background-color: #007AFF !important;
+	    }
+	  }
+	
 }
 .mainContent{
 	padding-top: 14rpx;
@@ -35,11 +74,11 @@
 	
 	background-repeat: no-repeat;
 	.topBox{
+		// height: 260rpx;
 		height: 260rpx;
-		// background: white;
-		// border-radius: 32rpx;
 		display: flex;
-		background-size: 100% 100%;
+		background-size: contain;
+		// background-size: 100% 100%;
 		
 		background-repeat: no-repeat;
 		// border: 4rpx solid #FFFFFF;
@@ -48,7 +87,9 @@
 		display: flex;
 		flex-direction: column;
 		padding-left: 110rpx;
-		padding-top: 36rpx;
+		padding-top: 78rpx;
+		
+		position: relative;
 		
 		.top{
 			font-size: 24rpx;
@@ -57,10 +98,19 @@
 			color: #007AFF;
 			
 			// width: 100%;
-			text-align: right;
-			padding-right: 88rpx;
+			// text-align: right;
+			// padding-right: 88rpx;
+			width: 118rpx;
+			height: 24rpx;
+			position: absolute;
+			right: 98rpx;
+			top:36rpx;
+			
+			
+			// background: red;
 		}
 		.bot{
+			
 			.center{
 				font-size: 30rpx;
 				font-family: SourceHanSansCN, SourceHanSansCN;
@@ -81,8 +131,14 @@
 				font-family: FZLANTY_TEK--GBK1, FZLANTY_TEK--GBK1;
 				font-weight: normal;
 				color: #FFFFFF;
-				line-height: 44rpx;
-				margin-top: 12rpx;
+				// line-height: 44rpx;
+				// margin-top: 12rpx;
+				// display: flex;
+				// align-items: flex-start;
+				
+				// background: red;
+				
+				margin-top: 2rpx;
 				.wArr{
 					width: 14rpx;
 					height: 24rpx;
@@ -101,6 +157,8 @@
 		background-repeat: no-repeat;
 		padding-top: 24rpx;
 		
+		margin-top: -48rpx;
+		
 		.title{
 			padding-left: 30rpx;
 			font-size: 36rpx;

pages/index/index.vue

@@ -4,8 +4,17 @@
 
 		<!-- 轮播图 -->
 		<view class="swiperBox">
-			<u-swiper height="514rpx" imgMode="aspectFill" :autoplay="false" :list="list1" @click="" circular>
+			<u-swiper height="572rpx" imgMode="" :autoplay="true" :list="list1" @click="" circular
+				@change="swiperChange">
 			</u-swiper>
+
+			<!-- 	<u-swiper height="572rpx" imgMode="aspectFill" :autoplay="false" :list="list1" @click="" circular>
+			</u-swiper> -->
+
+			<view class='swiperDot'>
+				<view :class="[currSwiperIndex==index?'dotA':'dot']" v-for="(item,index) in list1" :key="index">
+				</view>
+			</view>
 		</view>
 
 
@@ -91,6 +100,8 @@
 		},
 		data() {
 			return {
+				currSwiperIndex: 0,
+				// adListSwiper: [],
 				status: 'nomore',
 				picBase: this.$picBase,
 				baseUrl: uploadUrl.baseUrl,
@@ -180,7 +191,10 @@
 			}
 		},
 		methods: {
-
+			swiperChange(e) {
+				console.log('swiper---e', e);
+				this.currSwiperIndex = e.current
+			},
 			async getShare() {
 				let res1 = await getPosterBg({
 					key: 'share_title'
@@ -236,6 +250,7 @@
 					})
 
 					this.list1 = tempList
+					// this.adListSwiper = tempList
 					console.log('list1', this.list1);
 				} else {
 					this.$toast(res1.message)

pages/my/charge/index.vue

@@ -122,6 +122,22 @@
 				})
 			},
 			async goumai() {
+				let res = wx.getSystemInfoSync();
+				if (res.platform == 'ios') {
+					return wx.showModal({
+						title: '提示',
+						content: '【由于相关规范，iOS功能暂不可用】',
+						success(res) {
+							if (res.confirm) {
+								console.log('用户点击确定')
+							} else if (res.cancel) {
+								console.log('用户点击取消')
+							}
+						}
+					})
+				}
+
+
 				// this.$toast('购买成功')
 				// setTimeout(() => {
 				// 	uni.navigateTo({

pages/my/index.vue

@@ -304,9 +304,15 @@
 				if (!uni.getStorageSync('token')) {
 					return this.$toast('请登录后操作')
 				}
-				uni.navigateTo({
-					url: '/pages/my/tuiguangDashi/index'
-				})
+				if (this.userInfo.is_share) {
+					uni.navigateTo({
+						url: '/pages/my/pubCenter/index'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/my/tuiguangDashi/index'
+					})
+				}
 			},
 			toTuguangCenter() {
 				if (!uni.getStorageSync('token')) {

pages/my/jiangli/index.scss

@@ -18,7 +18,7 @@
 		padding-right: 30rpx;
 		.countBox{
 			
-			height: 290rpx;
+			// height: 310rpx;
 			// background:#0489F9;
 			// border: 2rpx solid;
 			
@@ -35,6 +35,8 @@
 			
 			background-size: 100% 372rpx;
 			background-repeat: no-repeat;
+			
+			padding-bottom: 48rpx;
 			.left,.right{
 				display: flex;
 				flex-direction: column;
@@ -91,14 +93,29 @@
 	.mianContent{
 		padding-left: 30rpx;
 		padding-right: 30rpx;
-		padding-top: 64rpx;
+		// padding-top: 64rpx;
 		// min-height: 1116rpx;
 		min-height: calc(900rpx - 126rpx);
-		background: #FFFFFF;
+		// background: #FFFFFF;
 		// background: skyblue;
-		box-shadow: 0rpx 4rpx 16rpx -8rpx rgba(0,103,104,0.16);
+		// box-shadow: 0rpx 4rpx 16rpx -8rpx rgba(0,103,104,0.16);
 		border-radius: 40rpx 40rpx 0 0;
 		position: relative;
+		
+		// background: red;
+		background-image:url('../../../static/other/bg_9.png');
+		background-repeat: no-repeat;
+		background-size: 100% 1120rpx;
+		background-position: 0rpx -5rpx;
+		
+		margin-top: -20rpx;
+		
+		// min-height:calc(100vh - 330rpx);
+		// background:#f7f8fb;
+		
+		.pPos{
+			height: 64rpx;
+		}
 		.sanjiaoxing{
 			position:absolute;
 			top: 0;

pages/my/jiangli/index.vue

@@ -25,8 +25,13 @@
 			</view>
 
 
-			<view class="mianContent">
-				<view class="sanjiaoxing">
+			<!-- <view class="mianContent" :style="{'background-image':`url(${picBase+'my_b_bg.png'})`}"> -->
+			<!-- <view class="mianContent" :style="{'background-image':`url(../../../static/other/bg_9.png)`}"> -->
+			<view class="mianContent" :style="">
+				<!-- 	<view class="sanjiaoxing">
+				</view> -->
+				<view class="pPos">
+
 				</view>
 
 				<view class="tipBox">

pages/my/myRecord/index.scss

@@ -22,7 +22,7 @@
 		
 		padding: 40rpx 32rpx;
 		position: relative;
-		margin-bottom: 24rpx;
+		margin-bottom: 8rpx;
 		
 		background-repeat: no-repeat;
 		background-size: 100% 100%;

pages/my/roleManage/index.scss

@@ -25,7 +25,9 @@
 	        flex-wrap: nowrap;
 	        overflow-x: scroll;
 	        height: 188rpx;
-	        margin-bottom: 24rpx;
+	        // margin-bottom: 24rpx;
+			
+			margin-bottom: 12rpx;
 			
 			
 	
@@ -48,14 +50,16 @@
 	        flex-shrink: 0;
 	        width: 100%;
 	        height: 188rpx;
-	        background: #FFFFFF;
+	        // background: #FFFFFF;
 	        // border-radius: 20rpx 0 0 20rpx;
 	        border-radius: 20rpx;
 	        padding: 32rpx 24rpx;
 			background-size: 100% 100%;
 			background-repeat: no-repeat;
 			
+			
 			// background: red;
+			
 	
 	        .top {
 	            .currLabel {

pages/my/team/index.scss

@@ -5,7 +5,7 @@
 	.container {
 		min-height: 100vh;
  .topBox{
-	height: 140rpx;
+	height: 160rpx;
 	background: #55ACF9;
 	padding-top: 24rpx;
 	padding-left: 30rpx;
@@ -40,26 +40,27 @@
 	
 		}
 		.mianContent{
-			padding-left: 30rpx;
-			padding-right: 30rpx;
-			padding-top: 48rpx;
+			
+			// padding-top: 48rpx;
 			min-height:calc(100vh - 300rpx);
 			
 			// height:calc(100vh - 110rpx);
 			
-			// min-height: 100%;
-			background: #fff;
-			// background: skyblue;
-			box-shadow: 0rpx 4rpx 16rpx -8rpx rgba(0,103,104,0.16);
+			// box-shadow: 0rpx 4rpx 16rpx -8rpx rgba(0,103,104,0.16);
 			border-radius: 40rpx 40rpx 0 0;
 			position: relative;
-			margin-top: -30rpx;
-			
-			// background-size: 100% 1332rpx;
-			// background-size: contain;
-			// background-repeat: no-repeat;
+			margin-top: -50rpx;
 			
+			background-size: 100% 1332rpx;
+			// background-position: 0rpx -50rpx;
+			background-size: contain;
+			background-repeat: no-repeat;
 			// background-blend-mode: overlay;
+			// background:#f7f8fb;
+			
+			.tPos{
+				height: 48rpx;
+			}
 			.sanjiaoxing{
 				position:absolute;
 				top: 0;
@@ -73,17 +74,20 @@
 			}
 			
 			.list{
+				padding-left: 30rpx;
+				padding-right: 30rpx;
 				display: flex;
 				flex-direction: column;
-				// padding-top: 34rpx;
+				
+				min-height:calc(100vh - 330rpx);
+				background:#f7f8fb;
 				// background: red;
-				// height: 100%;
 				
 				.item{
 					display: flex;
 					justify-content: space-between;
 					align-items: center;
-					margin-bottom:24rpx;
+					margin-bottom:12rpx;
 					
 					height: 176rpx;
 					// background: linear-gradient(287deg, #E5F1FF 0%, #FFFFFF 100%);

pages/my/team/index.vue

@@ -12,9 +12,13 @@
 			</view>
 		</view>
 
-		<!-- <view class="mianContent" :style="{'background-image':`url(${picBase+'my_b_bg.png'})`}"> -->
-		<view class="mianContent">
-			<view class="sanjiaoxing">
+		<view class="mianContent" :style="{'background-image':`url(${picBase+'my_b_bg.png'})`}">
+			<!-- <view class="mianContent"> -->
+			<!-- <view class="sanjiaoxing">
+			</view> -->
+
+			<view class="tPos">
+
 			</view>
 			<view class="list">
 				<view class="empty" style="margin-top: 50%;" v-if="list.length==0">
@@ -25,7 +29,6 @@
 				<view class="" v-else>
 					<view class="item" v-for="(item,index) in list"
 						:style="{'background-image':`url(${picBase+'card_b.png'})`}">
-						<!-- <image src="../../../static/tabbar/my.png" mode="" class="water2"></image> -->
 						<view class="left">
 							<image :src="!item.avatar?picBase+'defaultAvatar.png':item.avatar" mode="" class="avatar">
 							</image>

pages/my/userInfo/index.scss

@@ -71,42 +71,50 @@
 							border: none;
 						}
 					}
-					
-					.btnBox{
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						margin-top: 500rpx;
-						.btn{
-							width: 670rpx;
-							height: 96rpx;
-							background: linear-gradient(132deg, #0298FF 0%, #017AFF 100%);
-							box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,122,255,0.2);
-							border-radius: 54rpx;
-							display: flex;
-							align-items: center;
-							justify-content: center;
-						}
-						.b1{
-							font-size: 32rpx;
-							font-family: SourceHanSansCN, SourceHanSansCN;
-							font-weight: bold;
-							color: #FFFFFF;
-							
-							margin-bottom: 24rpx;
-						}
-						.b2{
-							font-size: 32rpx;
-							font-family: SourceHanSansCN, SourceHanSansCN;
-							font-weight: 500;
-							color: #666666;
-							border: 2rpx solid #999999;
-							background: none;
-							box-shadow:none;
-						}
-					}
 				}
 		}
 		
+		
+		
+		.btnBox{
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			// margin-top: 500rpx;
+			
+			position: fixed;
+			width: 100%;
+			bottom: 108rpx;
+			display: flex;
+			justify-content: center;
+			// background: red;
+			.btn{
+				width: 670rpx;
+				height: 96rpx;
+				background: linear-gradient(132deg, #0298FF 0%, #017AFF 100%);
+				box-shadow: 0rpx 4rpx 8rpx 0rpx rgba(0,122,255,0.2);
+				border-radius: 54rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+			.b1{
+				font-size: 32rpx;
+				font-family: SourceHanSansCN, SourceHanSansCN;
+				font-weight: bold;
+				color: #FFFFFF;
+				
+				margin-bottom: 24rpx;
+			}
+			.b2{
+				font-size: 32rpx;
+				font-family: SourceHanSansCN, SourceHanSansCN;
+				font-weight: 500;
+				color: #666666;
+				border: 2rpx solid #999999;
+				background: none;
+				box-shadow:none;
+			}
+		}
 	
  

pages/my/userInfo/index.vue

@@ -10,7 +10,7 @@
 			</view>
 
 			<view class="label">
-				推荐奖励
+				个人资料
 			</view>
 
 			<view class="editBox">
@@ -41,15 +41,13 @@
 					</view>
 				</view>
 			</view>
-
-
-			<view class="btnBox">
-				<view class="btn b1" @click="updateUserInfo">
-					保存修改
-				</view>
-				<view class="btn b2" @click="logoOut">
-					退出登录
-				</view>
+		</view>
+		<view class="btnBox">
+			<view class="btn b1" @click="updateUserInfo">
+				保存修改
+			</view>
+			<view class="btn b2" @click="logoOut">
+				退出登录
 			</view>
 		</view>
 

pages/my/yongjinDetail/index.scss

@@ -158,7 +158,7 @@
 			}
 		}
 		.list{
-			margin-top: 32rpx;
+			margin-top: 28rpx;
 			.item{
 				// height: 206rpx;
 				// background: #FFFFFF;
@@ -170,7 +170,7 @@
 				display: flex;
 				flex-direction: column;
 				padding-bottom: 32rpx;
-				margin-bottom: 24rpx;
+				margin-bottom: 8rpx;
 				position:relative;
 				
 				background-size: 100% 100%;

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

@@ -1557,7 +1557,7 @@ function initData(vueOptions, context) {
     try {
       data = data.call(context); // 支持 Vue.prototype 上挂的数据
     } catch (e) {
-      if (Object({"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));

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

@@ -40,13 +40,14 @@ view.data-v-78ae4888 {
   display: flex;
   background-size: cover;
   background-repeat: no-repeat;
+  box-shadow: 0rpx -2rpx 20rpx 0rpx rgba(0, 0, 0, 0.05);
 }
 .container .topBox .left .aiIcon.data-v-78ae4888 {
   height: 78rpx;
   margin-top: -14rpx;
 }
 .container .topBox .right.data-v-78ae4888 {
-  margin-left: 15rpx;
+  margin-left: -5rpx;
 }
 .container .topBox .right .label1.data-v-78ae4888 {
   height: 54rpx;
@@ -57,9 +58,10 @@ view.data-v-78ae4888 {
   font-weight: bold;
   color: #FFFFFF;
   text-shadow: 0px 4px 8px rgba(0, 67, 181, 0.16);
+  padding-left: 6rpx;
 }
 .container .mainBox.data-v-78ae4888 {
-  margin-top: 52rpx;
+  margin-top: 40rpx;
   padding: 0 30rpx;
 }
 .container .mainBox .titleBox.data-v-78ae4888 {

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

@@ -280,22 +280,19 @@ var _default = {
           console.log('this.percentage', _this2.percentage);
         }
       }, 1000);
-
-      // this.showLoading = false
-      // this.huibenDetail = getApp().huibenDetail
-
-      var firstImg = "<img src=\"".concat(getApp().huibenDetail.image, "\"/>");
-      getApp().huibenDetail.pinyin_content = firstImg + getApp().huibenDetail.pinyin_content;
+      console.log('接收的绘本详情', getApp().huibenDetail);
       this.huibenRes = getApp().huibenDetail;
-      console.log('this.huibenRes', this.huibenRes);
-      // this.content = `${getApp().huibenDetail.pinyin_content}`
+      var firstImg = "<img src=\"".concat(getApp().huibenDetail.image, "\"/>");
+      this.content = firstImg + getApp().huibenDetail.pinyin_content;
+      getApp().huibenDetail = null;
 
-      // setTimeout(() => {
-      // 	this.showLoading = false
-      // }, 5000);
+      // let pinyin_content = getApp().huibenDetail.pinyin_content
+      // pinyin_content.replace(firstImg, '')
+      // getApp().huibenDetail = null
+      // huibenInfo.pinyin_content = firstImg + pinyin_content
+      // this.huibenRes = huibenInfo
 
-      console.log('接收的绘本详情', getApp().huibenDetail);
-      getApp().huibenDetail = null;
+      console.log('this.content', this.content);
     }
   },
   methods: {
@@ -439,7 +436,10 @@ var _default = {
       });
     },
     onBack: function onBack() {
-      getApp().refreshRole = true;
+      this.huibenRes = null;
+
+      // getApp().refreshRole = true
+
       console.log('onBack()-----------');
       if (this.timer) {
         clearInterval(this.timer);
@@ -474,9 +474,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;
+                    firstImg = "<img src=\"".concat(res1.data.image, "\"/>");
+                    _this5.content = firstImg + res1.data.pinyin_content;
                     _this5.percentage = 99;
                     // this.showLoading = false
                     clearInterval(_this5.timer);

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

@@ -197,6 +197,8 @@ var _default = {
   },
   data: function data() {
     return {
+      currSwiperIndex: 0,
+      // adListSwiper: [],
       status: 'nomore',
       picBase: this.$picBase,
       baseUrl: _config.default.baseUrl,
@@ -287,6 +289,10 @@ var _default = {
     }
   },
   methods: (_methods = {
+    swiperChange: function swiperChange(e) {
+      console.log('swiper---e', e);
+      this.currSwiperIndex = e.current;
+    },
     getShare: function getShare() {
       var _this3 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
@@ -385,6 +391,7 @@ var _default = {
                     tempList.push(item.image_path);
                   });
                   _this5.list1 = tempList;
+                  // this.adListSwiper = tempList
                   console.log('list1', _this5.list1);
                 } else {
                   _this5.$toast(res1.message);

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

@@ -17,6 +17,38 @@
   position: relative;
   z-index: 0;
 }
+.swiperBox .swiperDot.data-v-57280228 {
+  z-index: 999999999;
+  bottom: 72rpx;
+  position: absolute;
+  margin-left: 50%;
+  -webkit-transform: translateX(-50%);
+          transform: translateX(-50%);
+  display: flex;
+  justify-content: center;
+  min-width: 30px;
+  height: 10rpx;
+  display: flex;
+  align-items: center;
+}
+.swiperBox .swiperDot .dot.data-v-57280228 {
+  width: 14rpx;
+  height: 10rpx;
+  background-color: #333333;
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
+  margin: 0 4rpx;
+  border-radius: 2rpx;
+}
+.swiperBox .swiperDot .dotA.data-v-57280228 {
+  width: 14rpx;
+  height: 10rpx;
+  -webkit-transform: skew(-10deg);
+          transform: skew(-10deg);
+  margin: 0 4rpx;
+  border-radius: 2rpx;
+  background-color: #007AFF !important;
+}
 .mainContent.data-v-57280228 {
   padding-top: 14rpx;
   margin-top: -38rpx;
@@ -31,20 +63,24 @@
 .mainContent .topBox.data-v-57280228 {
   height: 260rpx;
   display: flex;
-  background-size: 100% 100%;
+  background-size: contain;
   background-repeat: no-repeat;
   display: flex;
   flex-direction: column;
   padding-left: 110rpx;
-  padding-top: 36rpx;
+  padding-top: 78rpx;
+  position: relative;
 }
 .mainContent .topBox .top.data-v-57280228 {
   font-size: 24rpx;
   font-family: SourceHanSansCN, SourceHanSansCN;
   font-weight: bold;
   color: #007AFF;
-  text-align: right;
-  padding-right: 88rpx;
+  width: 118rpx;
+  height: 24rpx;
+  position: absolute;
+  right: 98rpx;
+  top: 36rpx;
 }
 .mainContent .topBox .bot .center.data-v-57280228 {
   font-size: 30rpx;
@@ -64,8 +100,7 @@
   font-family: FZLANTY_TEK--GBK1, FZLANTY_TEK--GBK1;
   font-weight: normal;
   color: #FFFFFF;
-  line-height: 44rpx;
-  margin-top: 12rpx;
+  margin-top: 2rpx;
 }
 .mainContent .topBox .bot .slogn .wArr.data-v-57280228 {
   width: 14rpx;
@@ -78,6 +113,7 @@
   background-size: 100% 366rpx;
   background-repeat: no-repeat;
   padding-top: 24rpx;
+  margin-top: -48rpx;
 }
 .mainContent .botBox .title.data-v-57280228 {
   padding-left: 30rpx;

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

@@ -291,16 +291,33 @@ var _default = {
     goumai: function goumai() {
       var _this4 = this;
       return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var res1;
+        var res, res1;
         return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                _context3.next = 2;
+                res = wx.getSystemInfoSync();
+                if (!(res.platform == 'ios')) {
+                  _context3.next = 3;
+                  break;
+                }
+                return _context3.abrupt("return", wx.showModal({
+                  title: '提示',
+                  content: '【由于相关规范，iOS功能暂不可用】',
+                  success: function success(res) {
+                    if (res.confirm) {
+                      console.log('用户点击确定');
+                    } else if (res.cancel) {
+                      console.log('用户点击取消');
+                    }
+                  }
+                }));
+              case 3:
+                _context3.next = 5;
                 return (0, _index.submitOrder)({
                   id: _this4.seledId
                 });
-              case 2:
+              case 5:
                 res1 = _context3.sent;
                 console.log('套餐下单返回值--------2', res1);
                 if (res1.code == 0) {
@@ -316,7 +333,7 @@ var _default = {
                 } else {
                   _this4.$toast(res1.message);
                 }
-              case 5:
+              case 8:
               case "end":
                 return _context3.stop();
             }

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

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

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

@@ -271,6 +271,11 @@ var _index = __webpack_require__(/*! @/api/index/index.js */ 163);
 //
 //
 //
+//
+//
+//
+//
+//
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
   // components: {

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

@@ -17,7 +17,7 @@ view.data-v-b9dfc90c {
 .container .mainBox .list .item.data-v-b9dfc90c {
   padding: 40rpx 32rpx;
   position: relative;
-  margin-bottom: 24rpx;
+  margin-bottom: 8rpx;
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }

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

@@ -21,7 +21,7 @@ view.data-v-0cdc6c50 {
   flex-wrap: nowrap;
   overflow-x: scroll;
   height: 188rpx;
-  margin-bottom: 24rpx;
+  margin-bottom: 12rpx;
 }
 .box .itemBox .delBtn.data-v-0cdc6c50 {
   flex-shrink: 0;
@@ -38,7 +38,6 @@ view.data-v-0cdc6c50 {
   flex-shrink: 0;
   width: 100%;
   height: 188rpx;
-  background: #FFFFFF;
   border-radius: 20rpx;
   padding: 32rpx 24rpx;
   background-size: 100% 100%;

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

@@ -237,6 +237,9 @@ var _index = __webpack_require__(/*! @/api/index/index.js */ 163);
 //
 //
 //
+//
+//
+//
 // import navBar from '@/components/navBar/index.vue'
 var _default = {
   // components: {

unpackage/dist/dev/mp-weixin/pages/my/team/index.wxml

@@ -1 +1 @@
-<view class="container data-v-6d0d2c8c"><nav-bar vue-id="65b44e8c-1" title="推广团队" back="{{true}}" color="#333333" background="#FFFFFF" class="data-v-6d0d2c8c" bind:__l="__l"></nav-bar><view class="topBox data-v-6d0d2c8c" style="{{'background-image:'+('url('+(picBase+'team_bg.png')+')')+';'}}"><view class="bar data-v-6d0d2c8c"><image class="tag data-v-6d0d2c8c" src="{{picBase+'hb_tips.png'}}" mode></image>{{'团队人数 '+$root.g0+'人'}}</view></view><view class="mianContent data-v-6d0d2c8c"><view class="sanjiaoxing data-v-6d0d2c8c"></view><view class="list data-v-6d0d2c8c"><block wx:if="{{$root.g1==0}}"><view class="empty data-v-6d0d2c8c" style="margin-top:50%;"><u-empty vue-id="65b44e8c-2" mode="data" class="data-v-6d0d2c8c" bind:__l="__l"></u-empty></view></block><block wx:else><view class="data-v-6d0d2c8c"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view class="item data-v-6d0d2c8c" style="{{'background-image:'+('url('+(picBase+'card_b.png')+')')+';'}}"><view class="left data-v-6d0d2c8c"><image class="avatar data-v-6d0d2c8c" src="{{!item.avatar?picBase+'defaultAvatar.png':item.avatar}}" mode></image><view class="des data-v-6d0d2c8c"><view class="name data-v-6d0d2c8c">{{''+(item.name?item.name:'默认用户')+''}}</view><view class="time data-v-6d0d2c8c">{{''+item.share_date+''}}</view></view></view><view class="right data-v-6d0d2c8c"><view class="money data-v-6d0d2c8c">{{'￥'+item.amount_sum_amount+''}}</view><view class="count data-v-6d0d2c8c">{{'充值次数'+item.order_count+''}}</view></view></view></block></view></block></view></view></view>
+<view class="container data-v-6d0d2c8c"><nav-bar vue-id="65b44e8c-1" title="推广团队" back="{{true}}" color="#333333" background="#FFFFFF" class="data-v-6d0d2c8c" bind:__l="__l"></nav-bar><view class="topBox data-v-6d0d2c8c" style="{{'background-image:'+('url('+(picBase+'team_bg.png')+')')+';'}}"><view class="bar data-v-6d0d2c8c"><image class="tag data-v-6d0d2c8c" src="{{picBase+'hb_tips.png'}}" mode></image>{{'团队人数 '+$root.g0+'人'}}</view></view><view class="mianContent data-v-6d0d2c8c" style="{{'background-image:'+('url('+(picBase+'my_b_bg.png')+')')+';'}}"><view class="tPos data-v-6d0d2c8c"></view><view class="list data-v-6d0d2c8c"><block wx:if="{{$root.g1==0}}"><view class="empty data-v-6d0d2c8c" style="margin-top:50%;"><u-empty vue-id="65b44e8c-2" mode="data" class="data-v-6d0d2c8c" bind:__l="__l"></u-empty></view></block><block wx:else><view class="data-v-6d0d2c8c"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view class="item data-v-6d0d2c8c" style="{{'background-image:'+('url('+(picBase+'card_b.png')+')')+';'}}"><view class="left data-v-6d0d2c8c"><image class="avatar data-v-6d0d2c8c" src="{{!item.avatar?picBase+'defaultAvatar.png':item.avatar}}" mode></image><view class="des data-v-6d0d2c8c"><view class="name data-v-6d0d2c8c">{{''+(item.name?item.name:'默认用户')+''}}</view><view class="time data-v-6d0d2c8c">{{''+item.share_date+''}}</view></view></view><view class="right data-v-6d0d2c8c"><view class="money data-v-6d0d2c8c">{{'￥'+item.amount_sum_amount+''}}</view><view class="count data-v-6d0d2c8c">{{'充值次数'+item.order_count+''}}</view></view></view></block></view></block></view></view></view>

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

@@ -8,7 +8,7 @@ view.data-v-6d0d2c8c {
   min-height: 100vh;
 }
 .container .topBox.data-v-6d0d2c8c {
-  height: 140rpx;
+  height: 160rpx;
   background: #55ACF9;
   padding-top: 24rpx;
   padding-left: 30rpx;
@@ -34,15 +34,16 @@ view.data-v-6d0d2c8c {
   margin-right: 12rpx;
 }
 .container .mianContent.data-v-6d0d2c8c {
-  padding-left: 30rpx;
-  padding-right: 30rpx;
-  padding-top: 48rpx;
   min-height: calc(100vh - 300rpx);
-  background: #fff;
-  box-shadow: 0rpx 4rpx 16rpx -8rpx rgba(0, 103, 104, 0.16);
   border-radius: 40rpx 40rpx 0 0;
   position: relative;
-  margin-top: -30rpx;
+  margin-top: -50rpx;
+  background-size: 100% 1332rpx;
+  background-size: contain;
+  background-repeat: no-repeat;
+}
+.container .mianContent .tPos.data-v-6d0d2c8c {
+  height: 48rpx;
 }
 .container .mianContent .sanjiaoxing.data-v-6d0d2c8c {
   position: absolute;
@@ -57,14 +58,18 @@ view.data-v-6d0d2c8c {
   border-top: 20rpx solid #5FADFC;
 }
 .container .mianContent .list.data-v-6d0d2c8c {
+  padding-left: 30rpx;
+  padding-right: 30rpx;
   display: flex;
   flex-direction: column;
+  min-height: calc(100vh - 330rpx);
+  background: #f7f8fb;
 }
 .container .mianContent .list .item.data-v-6d0d2c8c {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 24rpx;
+  margin-bottom: 12rpx;
   height: 176rpx;
   padding-left: 32rpx;
   padding-right: 32rpx;

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

@@ -202,8 +202,6 @@ var _config = _interopRequireDefault(__webpack_require__(/*! @/common/config.js
 //
 //
 //
-//
-//
 var _default = {
   // components: {
   // 	navBar

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

@@ -68,13 +68,17 @@ view.data-v-5c124276 {
 .container .outerBox .editBox .item.data-v-5c124276:last-child {
   border: none;
 }
-.container .outerBox .btnBox.data-v-5c124276 {
+.btnBox.data-v-5c124276 {
   display: flex;
   flex-direction: column;
   align-items: center;
-  margin-top: 500rpx;
+  position: fixed;
+  width: 100%;
+  bottom: 108rpx;
+  display: flex;
+  justify-content: center;
 }
-.container .outerBox .btnBox .btn.data-v-5c124276 {
+.btnBox .btn.data-v-5c124276 {
   width: 670rpx;
   height: 96rpx;
   background: linear-gradient(132deg, #0298FF 0%, #017AFF 100%);
@@ -84,14 +88,14 @@ view.data-v-5c124276 {
   align-items: center;
   justify-content: center;
 }
-.container .outerBox .btnBox .b1.data-v-5c124276 {
+.btnBox .b1.data-v-5c124276 {
   font-size: 32rpx;
   font-family: SourceHanSansCN, SourceHanSansCN;
   font-weight: bold;
   color: #FFFFFF;
   margin-bottom: 24rpx;
 }
-.container .outerBox .btnBox .b2.data-v-5c124276 {
+.btnBox .b2.data-v-5c124276 {
   font-size: 32rpx;
   font-family: SourceHanSansCN, SourceHanSansCN;
   font-weight: 500;

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

@@ -137,7 +137,7 @@ view.data-v-2e7f296a {
   top: -5rpx;
 }
 .container .bgBox .botContent .list.data-v-2e7f296a {
-  margin-top: 32rpx;
+  margin-top: 28rpx;
 }
 .container .bgBox .botContent .list .item.data-v-2e7f296a {
   border-radius: 32rpx;
@@ -147,7 +147,7 @@ view.data-v-2e7f296a {
   display: flex;
   flex-direction: column;
   padding-bottom: 32rpx;
-  margin-bottom: 24rpx;
+  margin-bottom: 8rpx;
   position: relative;
   background-size: 100% 100%;
   background-repeat: no-repeat;

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

@@ -8,11 +8,39 @@
     "miniprogram": {
       "list": [
         {
-          "name": "1",
+          "name": "佣金明细",
+          "pathName": "pages/my/yongjinDetail/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "推广团队",
+          "pathName": "pages/my/team/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "主角",
+          "pathName": "pages/my/roleManage/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "生成参数",
           "pathName": "pages/index/genHuiBen/index",
           "query": "",
           "launchMode": "default",
           "scene": null
+        },
+        {
+          "name": "推荐奖励",
+          "pathName": "pages/my/jiangli/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
         }
       ]
     }