Преглед на файлове

版本号修改,富文本兼容支付宝

DELL преди 3 години
родител
ревизия
25eb11cbd4
променени са 4 файла, в които са добавени 37 реда и са изтрити 24 реда
  1. 10 10
      src/packageOperate/activity/index.vue
  2. 2 2
      src/packageOther/about/index.vue
  3. 16 11
      src/packagePrize/address/index.vue
  4. 9 1
      src/packagePrize/coupon/detail.vue

+ 10 - 10
src/packageOperate/activity/index.vue

@@ -816,18 +816,18 @@
 			text-align: center;
 
 			&-view {
-				padding: 0 20rpx;
+				padding: 0 10rpx;
 
 				image {
-					width: 64rpx;
-					height: 64rpx;
-					vertical-align: -50%;
+					width: 60rpx;
+					height: 60rpx;
+					vertical-align: -48%;
 				}
 
 				text {
 					line-height: 100rpx;
-					margin: 20rpx;
-					font-size: 30rpx;
+					margin: 20rpx 15rpx;
+					font-size: 28rpx;
 					color: #333333;
 				}
 
@@ -835,10 +835,10 @@
 					text-align: center;
 					border-radius: 6rpx;
 					display: inline-block;
-					height: 44rpx;
-					line-height: 44rpx;
-					font-size: 26rpx;
-					width: 112rpx;
+					height: 40rpx;
+					line-height: 38rpx;
+					font-size: 24rpx;
+					width: 110rpx;
 					color: #f9822c;
 					background-color: #fff;
 					border: 2rpx solid #f9822c;

+ 2 - 2
src/packageOther/about/index.vue

@@ -11,10 +11,10 @@
 			<view class="flex about-logo">
 				<image src="../../static/public/logo.png" mode="scaleToFill"></image>
 				<!-- #ifndef MP-ALIPAY -->
-				<view class="edition">v 1.0.5</view>
+				<view class="edition">v 1.0.6</view>
 				<!-- #endif -->
 				<!-- #ifdef MP-ALIPAY -->
-				<view class="edition">v 2.1.39</view>
+				<view class="edition">v 2.1.43</view>
 				<!-- #endif -->
 			</view>
 			<view class="about-action">

+ 16 - 11
src/packagePrize/address/index.vue

@@ -19,14 +19,15 @@
 			</view>
 			<view class="content">
 				<view class="address-box" v-for="(item,index) in list" :key="index">
-					<text class="store-name" selectable="true">{{item.name}}</text>
+					<text class="store-name" selectable="true" user-select={true}>{{item.name}}</text>
 					<view class="store-address">
 						<text>地址:{{item.addressAll}}</text>
 						<view @click="copyDeliveryFlowId(item.addressAll)">复制</view>
 					</view>
 				</view>
 			</view>
-			<u-loadmore :line="true" v-if="list.length>10" :status="status" :loading-text="'努力加载中'" :nomore-text="'已经到底了'" />
+			<u-loadmore :line="true" v-if="list.length>10" :status="status" :loading-text="'努力加载中'"
+				:nomore-text="'已经到底了'" />
 		</view>
 		<view class="flex empty" v-if="!list.length">
 			<view class="center">
@@ -36,7 +37,7 @@
 				<view class="center-font">暂无门店</view>
 			</view>
 		</view>
-
+		<u-toast ref="uToast"></u-toast>
 		<address-popup :address-show="addressShow" @cancel="cancel" @confirmAddress="confirmAddress" />
 	</view>
 </template>
@@ -57,7 +58,7 @@
 				info: {},
 				total: 0,
 				pageNum: 1,
-				status: 'nomore',//上拉刷新状态
+				status: 'nomore', //上拉刷新状态
 			};
 		},
 		onLoad(options) {
@@ -75,12 +76,13 @@
 				uni.showLoading({
 					title: '加载中'
 				});
-				$http.post(`/api/v1/mp/user/mine/coupon/channel/list?pageNum=${this.pageNum}&pageSize=20`, { ...this.info, couponId: this.couponId }).then(
+				$http.post(`/api/v1/mp/user/mine/coupon/channel/list?pageNum=${this.pageNum}&pageSize=20`, { ...this.info,
+					couponId: this.couponId }).then(
 					res => {
 						uni.hideLoading();
 						if (res.code == 0) {
 							this.list = this.list.concat(res.rows)
-							this.list.forEach(item=>{
+							this.list.forEach(item => {
 								item.addressAll = `${item.province} ${item.city} ${item.area} ${item.address}`
 							})
 							this.total = res.total
@@ -105,15 +107,18 @@
 				this.pageList()
 			},
 			copyDeliveryFlowId(data) {
-				uni.setClipboardData({data});
+				uni.setClipboardData({ data });
+				// #ifdef MP-ALIPAY
+				this.$refs.uToast.show({ message: "内容已复制" })
+				// #endif
 			},
 		},
 		onReachBottom() {
-			if(this.total < this.pageNum * 20) return ;
+			if (this.total < this.pageNum * 20) return;
 			this.status = 'loading';
 			++this.pageNum
-			if(this.total < this.pageNum * 20) this.status = 'nomore';
-				else this.status = 'loading';
+			if (this.total < this.pageNum * 20) this.status = 'nomore';
+			else this.status = 'loading';
 			this.getList()
 		},
 	}
@@ -159,7 +164,7 @@
 				}
 
 				.store-address {
-					
+
 					text {
 						font-size: 24rpx;
 						color: #999;

+ 9 - 1
src/packagePrize/coupon/detail.vue

@@ -78,6 +78,7 @@
 
 <script>
 	import $http from '@/utils/request.js'
+	import parse from 'mini-html-parser2';
 	const qrCode = require('@/common/weapp-qrcode.js')
 	export default {
 		data() {
@@ -100,8 +101,15 @@
 				}).then(res => {
 					uni.hideLoading();
 					if (res.code == 0) {
+						res.data.description = res.data.description.replaceAll('\n','<br/>')
 						this.info = res.data
-						this.info.description = this.info.description.replaceAll('\n','<br/>')
+						// #ifdef MP-ALIPAY
+						parse(this.info.description,(err,nodes) => {
+							if(!err){
+								this.info.description = nodes
+							}
+						})
+						// #endif
 						setTimeout(() => {
 							uni.hideLoading();
 							this.couponQrCode()