Преглед изворни кода

权益卡只能微信支付,优惠券添加使用说明

zhanghui пре 2 година
родитељ
комит
362b01b683

+ 11 - 0
orderPages/myCoupon/module/index.rpx.css

@@ -59,6 +59,7 @@
     color: #999999;
     line-height: 36rpx;
     margin-left: 24rpx;
+
 }
 .h-btn-value-use{
     width: 156rpx;
@@ -77,3 +78,13 @@
     width: 136rpx;
     height: 136rpx;
 }
+.remark{
+    width: 646rpx;
+    padding: 20rpx;
+    font-size: 25rpx;
+    line-height: 40rpx;
+    background: #FFFFFF;
+    border-radius: 20rpx;
+    text-indent: 2em;
+    color: #999999;
+}

+ 46 - 31
orderPages/myCoupon/module/mescrollUni-item.vue

@@ -11,50 +11,55 @@
 		<view class="flex-row justify-center">
 
 			<view class="flex-col">
+				<view  class="flex-col" :class="item.state == '0'?'':'listBackground'" v-for="(item,index) in list" :key="index" >
 
-				<view  class="row-list flex-row justify-start" :class="item.state == '0'?'':'listBackground'" v-for="(item,index) in list" :key="index" >
-
-					<view class="h-text flex-col justify-center ">
-						<view class="money">
-							<text>¥{{item.discountsPrice}}</text>
-						</view>
-						<view class="desc">
-							<text>满{{item.reachPrice}}可用</text>
-						</view>
-					</view>
-
-					<view class="h-center-content flex-col justify-around">
-						<view class="h-value">
-							<text>{{item.name}}</text>
-						</view>
-<!--						<view class="title">-->
-<!--							使用平台:<text v-if="item.strategyType == '0'">全平台</text>-->
-<!--							<text v-else-if="item.strategyType == '1'">个人优惠卷</text>-->
-<!--						</view>-->
-						<view class="title">
-							使用次数:{{item.degree}}
+					<view class="row-list flex-row justify-start">
+						<view class="h-text flex-col justify-center ">
+							<view class="money">
+								<text>¥{{item.discountsPrice}}</text>
+							</view>
+							<view class="desc">
+								<text>满{{item.reachPrice}}可用</text>
+							</view>
 						</view>
-						<view class="title">
-							到期时间:{{item.endTime.substring(0,10)}}
+						<view class="h-center-content flex-col justify-around">
+							<view class="h-value">
+								<text>{{item.name}}</text>
+							</view>
+							<!--						<view class="title">-->
+							<!--							使用平台:<text v-if="item.strategyType == '0'">全平台</text>-->
+							<!--							<text v-else-if="item.strategyType == '1'">个人优惠卷</text>-->
+							<!--						</view>-->
+							<view class="title">
+								使用次数:{{item.degree}}
+							</view>
+							<view class="title">
+								到期时间:{{item.endTime.substring(0,10)}}
+							</view>
+							<view class="title flex-row">
+								<text @click="showRemark(item)">使用说明</text>
+								<u-icon v-if="item.id == showRemarkId" name="arrow-down-fill" color="" size="12"></u-icon>
+								<u-icon v-else name="play-right-fill" color="" size="12"></u-icon>
+							</view>
 						</view>
-					</view>
-
-					<view class="h-right-content flex-col justify-center ">
+						<view class="h-right-content flex-col justify-center ">
 							<view v-if="item.state == 0" ></view>
-<!--							<view @click="gotoUseCoupon(item)" v-if="item.state == 0" class="h-btn-value-use">立即使用</view>-->
+							<!--							<view @click="gotoUseCoupon(item)" v-if="item.state == 0" class="h-btn-value-use">立即使用</view>-->
 							<!-- <view @click="gotoReceiveCoupon()" v-else-if="index == 1" class="h-btn-value-receive">立即领取</view> -->
 							<view v-else-if="item.state == 1" class="h-btn-img">
 								<image class="h-btn-img" src="/static/coupon/u2109.png" mode=""></image>
 							</view>
 							<view v-else class="h-btn-img">
-								<image class="h-btn-img" src="/static/coupon/u2108.png" mode=""></image>
+								<image class="h-btn-img" color="#999999" src="/static/coupon/u2108.png" mode=""></image>
 							</view>
+						</view>
+					</view>
+					<view v-if="showRemarkId == item.id" class="remark">
+						<text class="remarkText">{{item.remark}}</text>
 					</view>
-
 				</view>
-			</view>
-
 
+			</view>
 
 
 		</view>
@@ -72,6 +77,7 @@ export default {
 
 	data() {
 		return {
+			showRemarkId:'',
 			downOption: {
 				auto: false // 不自动加载 (mixin已处理第一个tab触发downCallback)
 			},
@@ -125,6 +131,15 @@ export default {
 
 	methods: {
 
+		showRemark(item){
+			if (this.showRemarkId == item.id ){
+				this.showRemarkId = ''
+
+			}else {
+				this.showRemarkId = item.id
+
+			}
+		},
 
 
 		/*下拉刷新的回调 */

+ 10 - 0
orderPages/receiveCoupons/index.rpx.scss

@@ -126,3 +126,13 @@
   color: #8f939c;
   margin-top: 20rpx;
 }
+.remark{
+  width: 646rpx;
+  font-size: 25rpx;
+  line-height: 40rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  padding: 20rpx;
+  text-indent: 2em;
+  color: #999999;
+}

+ 50 - 25
orderPages/receiveCoupons/index.vue

@@ -9,36 +9,48 @@
 			</view>
 		</view>
 		<view v-else>
-		<view  class="row-list flex-row justify-start" v-for="(item,index) in countsList" :key="index">
-			<view class="h-text flex-col justify-center ">
-				<view class="money">
-					<text>¥{{item.discountsPrice}}</text>
-				</view>
-				<view class="desc">
-					<text>满{{item.reachPrice}}可用</text>
-				</view>
-			</view>
+		<view  class="flex-col" v-for="(item,index) in countsList" :key="index">
 
-			<view class="h-center-content flex-col justify-around">
-				<view class="h-value">
-					<text>{{item.name}}</text>
+			<view class="row-list flex-row justify-start">
+				<view class="h-text flex-col justify-center ">
+					<view class="money">
+						<text>¥{{item.discountsPrice}}</text>
+					</view>
+					<view class="desc">
+						<text>满{{item.reachPrice}}可用</text>
+					</view>
 				</view>
-<!--				<view class="title">-->
-<!--					使用平台:<text v-if="item.strategyType == '0'">全平台</text>-->
-<!--					<text v-else-if="item.strategyType == '1'">个人优惠卷</text>-->
-<!--				</view>-->
-				<view class="title">
-					使用次数:{{item.degree}}
+
+				<view class="h-center-content flex-col justify-around">
+					<view class="h-value">
+						<text>{{item.name}}</text>
+					</view>
+					<!--				<view class="title">-->
+					<!--					使用平台:<text v-if="item.strategyType == '0'">全平台</text>-->
+					<!--					<text v-else-if="item.strategyType == '1'">个人优惠卷</text>-->
+					<!--				</view>-->
+					<view class="title">
+						使用次数:{{item.degree}}
+					</view>
+					<view class="title">
+						领取后{{item.effectiveDays}}天内有效
+					</view>
+					<view class="title flex-row">
+						<text @click.stop="showRemark(item)">使用说明</text>
+						<u-icon v-if="item.id == showRemarkId" name="arrow-down-fill" color="" size="12"></u-icon>
+						<u-icon v-else name="play-right-fill" color="" size="12"></u-icon>
+					</view>
 				</view>
-				<view class="title">
-          领取后{{item.effectiveDays}}天内有效
+
+				<view class="h-right-content flex-col justify-center ">
+					<view class="btn" @click="gotoReceiveCoupon(item)">
+						<text>立即领取</text>
+					</view>
 				</view>
 			</view>
 
-			<view class="h-right-content flex-col justify-center ">
-				<view class="btn" @click="gotoReceiveCoupon(item)">
-					<text>立即领取</text>
-				</view>
+			<view v-if="showRemarkId == item.id" class="remark">
+				<text>{{item.remark}}</text>
 			</view>
 
 		</view>
@@ -50,7 +62,8 @@
 	export default {
 		data() {
 			return {
-				countsList:[]
+				countsList:[],
+				showRemarkId:'',
 			};
 		},
 		onLoad(option) {
@@ -59,6 +72,18 @@
 
 		methods: {
 
+
+			showRemark(item){
+				if (this.showRemarkId == item.id ){
+					this.showRemarkId = ''
+
+				}else {
+					this.showRemarkId = item.id
+
+				}
+			},
+
+
 			// 领取优惠劵
 			gotoReceiveCoupon(item) {
 				this.$api.claimCoupon({id:item.id}).then((res) => {

+ 10 - 0
orderPages/useCoupons/index.rpx.scss

@@ -115,3 +115,13 @@
   color: #8f939c;
   margin-top: 20rpx;
 }
+.remark{
+  width: 646rpx;
+  font-size: 25rpx;
+  line-height: 40rpx;
+  background: #FFFFFF;
+  border-radius: 20rpx;
+  padding: 20rpx;
+  text-indent: 2em;
+  color: #999999;
+}

+ 54 - 30
orderPages/useCoupons/index.vue

@@ -22,46 +22,60 @@
         </view>
         <view  :style="{'height':scrollViewHeight}">
             <scroll-view class="scroll " :style="{'height':scrollViewHeight}" scroll-y>
-                <view  class="row-list flex-row justify-start" :class="{'grayscale' : item.reachPrice*1 >standardPrice*1 }" v-for="(item,index) in countsList" @click="clickCoupons(item,index)" :key="index">
-                    <view class="h-text flex-col justify-center ">
-                        <view class="money">
-                            <text>¥{{item.discountsPrice}}</text>
-                        </view>
-                        <view class="desc">
-                            <text>满{{item.reachPrice}}可用</text>
-                        </view>
-                    </view>
+                <view  class="flex-col" :class="{'grayscale' : item.reachPrice*1 >standardPrice*1 }" v-for="(item,index) in countsList" @click="clickCoupons(item,index)" :key="index">
 
-                    <view class="h-center-content flex-col justify-around">
-                        <view class="h-value">
-                            <text>{{item.name}}</text>
-                        </view>
-<!--                        <view class="title">-->
-<!--                            使用平台:<text v-if="item.strategyType == '0'">全平台</text>-->
-<!--                            <text v-else-if="item.strategyType == '1'">个人优惠卷</text>-->
-<!--                        </view>-->
-                        <view class="title">
-                            使用次数:{{item.degree}}
-                        </view>
-                        <view class="title">
-                            到期时间:{{item.endTime.substring(0,10)}}
+                    <view class="row-list flex-row justify-start">
+                        <view class="h-text flex-col justify-center ">
+                            <view class="money">
+                                <text>¥{{item.discountsPrice}}</text>
+                            </view>
+                            <view class="desc">
+                                <text>满{{item.reachPrice}}可用</text>
+                            </view>
                         </view>
-                    </view>
 
-                    <view class="h-right-content flex-col justify-center">
+                        <view class="h-center-content flex-col justify-around">
+                            <view class="h-value">
+                                <text>{{item.name}}</text>
+                            </view>
+                            <!--                        <view class="title">-->
+                            <!--                            使用平台:<text v-if="item.strategyType == '0'">全平台</text>-->
+                            <!--                            <text v-else-if="item.strategyType == '1'">个人优惠卷</text>-->
+                            <!--                        </view>-->
+                            <view class="title">
+                                使用次数:{{item.degree}}
+                            </view>
+                            <view class="title">
+                                到期时间:{{item.endTime.substring(0,10)}}
+                            </view>
 
-                        <view class="flex-row justify-center" v-if="item.reachPrice*1 >standardPrice*1 ">
-                            <view class="h-btn-img">
-                                <image class="h-btn-img" src="/static/coupon/u2110.png" mode=""></image>
+                            <view class="title flex-row">
+                                <text @click.stop="showRemark(item)">使用说明</text>
+                                <u-icon v-if="item.id == showRemarkId" name="arrow-down-fill" color="" size="12"></u-icon>
+                                <u-icon v-else name="play-right-fill" color="" size="12" @click.stop="showRemark(item)"></u-icon>
                             </view>
                         </view>
 
-                        <view class="flex-row justify-center" v-else>
-                            <u-icon v-if="item.isUse " name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
-                            <u-icon v-else name="/static/order/ud9.png" color="green" size="25"></u-icon>
+                        <view class="h-right-content flex-col justify-center">
+
+                            <view class="flex-row justify-center" v-if="item.reachPrice*1 >standardPrice*1 ">
+                                <view class="h-btn-img">
+                                    <image class="h-btn-img" src="/static/coupon/u2110.png" mode=""></image>
+                                </view>
+                            </view>
+
+                            <view class="flex-row justify-center" v-else>
+                                <u-icon v-if="item.isUse " name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
+                                <u-icon v-else name="/static/order/ud9.png" color="green" size="25"></u-icon>
+                            </view>
+
                         </view>
 
                     </view>
+                    <view v-if="showRemarkId == item.id" class="remark">
+                        <text>{{item.remark}}</text>
+                    </view>
+
                 </view>
             </scroll-view>
         </view>
@@ -77,6 +91,7 @@
 export default {
   data() {
     return {
+        showRemarkId:'',
         countsList:[],
         noUse:true,
         windowHeight:'',
@@ -101,6 +116,15 @@ export default {
   },
   methods: {
 
+      showRemark(item){
+          if (this.showRemarkId == item.id ){
+              this.showRemarkId = ''
+
+          }else {
+              this.showRemarkId = item.id
+          }
+      },
+
       useCoupons(){
           let  useCoupons = []
           for (const useCoupon of this.countsList) {

+ 1 - 1
storePages/rights/index.rpx.scss

@@ -125,7 +125,7 @@
 
 
 .payView{
-  height: 638rpx;
+  height: 400rpx;
   background: #FFFFFF;
   box-shadow: 0rpx -4rpx 8rpx 0rpx rgba(0,0,0,0.03);
   border-radius: 24rpx 24rpx 0rpx 0rpx;

+ 25 - 25
storePages/rights/index.vue

@@ -56,33 +56,33 @@
 
 			<view class=" payView">
 				<view class="flex-row justify-between">
-					<text class="payType">请选择支付方式</text>
+					<text class="payType">微信支付</text>
 					<image class="x" src="/static/common/ox.png" @click="closePayPopup"></image>
 				</view>
-				<view class="payTitle">
-					<text>选择微信支付或余额支付</text>
-				</view>
-
-
-				<view class="payItem flex-row justify-between" @click="payItem(1)">
-					<view class="flex-row">
-						<u-icon name="/static/me/u701.png" color="#38db38" size="36"></u-icon>
-						<view class="payName flex-col justify-center">
-							<text>余额支付</text>
-							<text class="balance">可以余额¥{{userInfo.balance || 0}}</text>
-						</view>
-					</view>
-
-					<view class="flex-col justify-center">
-						<view v-if="curServiceTab === 1" >
-							<u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>
-						</view>
-						<view v-else>
-							<u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>
-						</view>
-					</view>
-
-				</view>
+<!--				<view class="payTitle">-->
+<!--					<text>选择微信支付或余额支付</text>-->
+<!--				</view>-->
+
+
+<!--				<view class="payItem flex-row justify-between" @click="payItem(1)">-->
+<!--					<view class="flex-row">-->
+<!--						<u-icon name="/static/me/u701.png" color="#38db38" size="36"></u-icon>-->
+<!--						<view class="payName flex-col justify-center">-->
+<!--							<text>余额支付</text>-->
+<!--							<text class="balance">可以余额¥{{userInfo.balance || 0}}</text>-->
+<!--						</view>-->
+<!--					</view>-->
+
+<!--					<view class="flex-col justify-center">-->
+<!--						<view v-if="curServiceTab === 1" >-->
+<!--							<u-icon name="checkmark-circle-fill" color="#38db38" size="25"></u-icon>-->
+<!--						</view>-->
+<!--						<view v-else>-->
+<!--							<u-icon name="/static/order/ud9.png" color="green" size="25"></u-icon>-->
+<!--						</view>-->
+<!--					</view>-->
+
+<!--				</view>-->
 
 				<view class="payItem flex-row justify-between" @click="payItem(2)">
 					<view class="flex-row">