Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp

pages/components/notice-index.vue

@@ -84,20 +84,26 @@
 		<!-- 右侧抽屉 -->
 		<uni-drawer ref="showRight" mode="right" :mask-click="true" @change="change($event)" width="160">
 			<view class="scroll-view">
+				<view style="position: absolute;height: 100%;width: 30%;z-index: 99;" @click="closeDrawer"></view>
 				<scroll-view class="scroll-view-box" scroll-y="true">
-					<view class="info-content" @click="confirmItem(null)">
+					<view style="padding-left:30%;background: transparent;height: 100%;">
-						<image v-show="0==chooseCondition" class="image" src="@/static/platform/quanbu.png"
+						<view class="uni-common-mt">
-							mode="aspectFit"></image>
+							<view class="info-content" @click="confirmItem(null)">
-						<view class="title">不限</view>
+								<image v-show="0==chooseCondition" class="image" src="@/static/platform/quanbu.png"
-					</view>
+									mode="aspectFit"></image>
-					<view v-show="0==chooseCondition" class="info-content" v-for="(item,index) in platformList"
+								<view class="title">不限</view>
-						@click="confirmItem(item)" :key="index">
+							</view>
-						<image class="image" :src="'/static/platform/'+item.code+'.png'" mode="aspectFit"></image>
+							<view v-show="0==chooseCondition" class="info-content" v-for="(item,index) in platformList"
-						<view class="title">{{item.title}}</view>
+								@click="confirmItem(item)" :key="index">
-					</view>
+								<image class="image" :src="'/static/platform/'+item.code+'.png'" mode="aspectFit">
-					<view v-show="1==chooseCondition" class="info-content" v-for="(item,index) in bloggerTypeList"
+								</image>
-						@click="confirmItem(item)" :key="index">
+								<view class="title">{{item.title}}</view>
-						<view class="title">{{item.title}}</view>
+							</view>
+							<view v-show="1==chooseCondition" class="info-content"
+								v-for="(item,index) in bloggerTypeList" @click="confirmItem(item)" :key="index">
+								<view class="title">{{item.title}}</view>
+							</view>
+						</view>
 					</view>
 				</scroll-view>
 			</view>
@@ -105,8 +111,9 @@
 		<!-- 右侧抽屉 -->
 		<uni-drawer ref="showRight2" mode="right" :mask-click="true" @change="change($event)" width="260">
 			<view class="scroll-view">
+				<view style="position: absolute;height: 100%;width: 30%;z-index: 99;" @click="closeDrawer"></view>
 				<scroll-view class="scroll-view-box" scroll-y="true">
-					<view style="padding: 20rpx 30rpx;">
+					<view style="padding-left:30%;background: transparent;height: 100%;">
 						<view class="uni-common-mt">
 							<view class="uni-form-item uni-column">
 								<view class="title">粉丝量要求</view>
@@ -147,9 +154,10 @@
 							<view class="uni-form-item uni-column">
 								<view class="title">地区</view>
 								<view class="dl-drawer-item">
-									<uni-data-picker placeholder="请选择" popup-title="请选择地址" :localdata="dataTree"
+									<uni-data-picker style="width: 100%;padding: 10rpx 10rpx 10rpx 0;" placeholder="请选择"
-										v-model="queryParams.cityId" @change="onchange" @nodeclick="onnodeclick"
+										popup-title="请选择地址" :localdata="dataTree" v-model="queryParams.cityId"
-										@popupopened="onpopupopened" @popupclosed="onpopupclosed">
+										@change="onchange" @nodeclick="onnodeclick" @popupopened="onpopupopened"
+										@popupclosed="onpopupclosed">
 									</uni-data-picker>
 								</view>
 							</view>
@@ -408,6 +416,7 @@
 			},
 			// 关闭窗口
 			closeDrawer(e) {
+				debugger
 				this.chooseCondition = 9
 				this.$refs.showRight.close()
 				this.$refs.showRight2.close()
@@ -861,20 +870,29 @@
 		width: 100%;
 		height: 100%;
 		/* #endif */
-		flex: 1
+		flex: 1;
 	}
 
 	// 处理抽屉内容滚动
 	.scroll-view-box {
+
 		flex: 1;
 		position: absolute;
 		top: 0;
 		right: 0;
 		bottom: 0;
 		left: 0;
-		padding-top: calc(var(--status-bar-height) + 100rpx);
+		// padding-top: calc(var(--status-bar-height) + 100rpx);
-		padding-bottom: 100rpx;
+		// padding-bottom: 100rpx;
 		font-size: 30rpx;
+
+		.uni-common-mt {
+			padding-top: calc(var(--status-bar-height) + 100rpx);
+			padding-left: 20rpx;
+			padding-bottom: 100rpx;
+			height: 100%;
+			background: white;
+		}
 	}
 
 	.info-content {
@@ -951,4 +969,23 @@
 			margin: 10rpx;
 		}
 	}
+
+	.uni-drawer--right {
+		width: 100% !important;
+		background: transparent !important;
+	}
+
+	.input-value-border {
+		border: 1px solid #F4F4F4 !important;
+		font-size: 30rpx !important;
+		color: #929292 !important;
+	}
+
+	.placeholder {
+		font-size: 30rpx !important;
+	}
+
+	.text-color {
+		color: #929292 !important;
+	}
 </style>

pages/mine/coupon/coupon-list.vue

@@ -13,7 +13,7 @@
 						<view class="bg-img">加速特权</view>
 					</view>
 					<view class="content-img">
-
+						<image src="@/static/mine/coupon/quan.png" mode="aspectFit"></image>
 					</view>
 					<view class="bottom-content">
 						<view class="top-text">剩余<text>{{ coupon }}</text>张</view>
@@ -23,10 +23,10 @@
 				</view>
 			</view>
 			<view class="item-field" style="align-items: center;">
-<!--				<view class="my-suggest-dom" @click="viewRichText()">-->
+				<!--				<view class="my-suggest-dom" @click="viewRichText()">-->
-<!--					<text>了解通告券</text>-->
+				<!--					<text>了解通告券</text>-->
-<!--					<uni-icons type="right" color="#363636" size="14"></uni-icons>-->
+				<!--					<uni-icons type="right" color="#363636" size="14"></uni-icons>-->
-<!--				</view>-->
+				<!--				</view>-->
 				<view class="my-suggest-dom" @click="goMyCoupon(1)">
 					<text>购买记录</text>
 					<uni-icons type="right" color="#363636" size="14"></uni-icons>
@@ -38,7 +38,9 @@
 
 <script>
 	import navigationBarVue from '@/components/navigation/navigationBar.vue';
-  import {getMemberCoupon} from '@/api/business/member.js'
+	import {
+		getMemberCoupon
+	} from '@/api/business/member.js'
 	export default {
 		components: {
 			navigationBarVue
@@ -46,20 +48,19 @@
 		data() {
 			return {
 				globalConfig: getApp().globalData.config,
-        coupon:0
+				coupon: 0
 			}
 		},
-    onLoad(options){
+		onLoad(options) {},
-    },
+		onShow() {
-    onShow(){
+			this.initMyCoupon()
-      this.initMyCoupon()
+		},
-    },
 		methods: {
-      initMyCoupon(){
+			initMyCoupon() {
-        getMemberCoupon().then(res=>{
+				getMemberCoupon().then(res => {
-          this.coupon = res.data
+					this.coupon = res.data
-        })
+				})
-      },
+			},
 			viewRichText() {
 				this.$tab.navigateTo(
 					`/pages/common/richview/index?title=${this.globalConfig.appInfo.agreements[5].title}&code=${this.globalConfig.appInfo.agreements[5].code}`
@@ -67,7 +68,7 @@
 			},
 			goMyCoupon(index) {
 				this.$tab.navigateTo(
-					`/pages/mine/coupon/my-coupon?index=${index}&coupon=`+this.coupon
+					`/pages/mine/coupon/my-coupon?index=${index}&coupon=` + this.coupon
 				)
 			}
 		}
@@ -167,6 +168,11 @@
 						width: 100%;
 						height: 200rpx;
 						margin-bottom: 20rpx;
+
+						image {
+							width: 100%;
+							height: 100%;
+						}
 					}
 
 					.bottom-content {