!26 接口层兼容

Merge pull request !26 from Bluemark/vue3_tmp

.env

@@ -1,20 +0,0 @@
-# 版本号
-SHOPRO_VERSION = v1.8.3
-
-# 正式环境接口域名
-SHOPRO_BASE_URL = https://api.shopro.sheepjs.com
-
-# 开发环境接口域名
-SHOPRO_DEV_BASE_URL = https://api.shopro.sheepjs.com
-
-# 开发环境运行端口
-SHOPRO_DEV_PORT = 3000
-
-# 接口地址前缀
-SHOPRO_API_PATH = /shop/api/
-
-# 客户端静态资源地址 空=默认使用服务端指定的CDN资源地址前缀 | local=本地  |  http(s)://xxx.xxx=自定义静态资源地址前缀
-SHOPRO_STATIC_URL = https://file.sheepjs.com
-
-# 是否开启直播  1 开启直播 | 0 关闭直播 (小程序官方后台未审核开通直播权限时请勿开启)
-SHOPRO_MPLIVE_ON = 0

pages/coupon/list.vue

@@ -148,11 +148,20 @@
 		});
 		if (res.code === 0) {
 			// 拦截修改数据
+			let obj2 = {
+				2: '折扣',
+				1: '满减'
+			}
 			let obj = {
 				1: '可用',
 				2: '已用',
 				3: '过期'
 			}
+			let obj3 = {
+				1: '已领取',
+				2: '已使用',
+				3: '已过期'
+			}
 			res.data.list = res.data.list.map(item => {
 				return {
 					...item,
@@ -160,7 +169,8 @@
 					amount: (item.discountPrice / 100).toFixed(2),
 					use_start_time: sheep.$helper.timeFormat(item.validStartTime, 'yyyy-mm-dd hh:MM:ss'),
 					use_end_time: sheep.$helper.timeFormat(item.validEndTime, 'yyyy-mm-dd hh:MM:ss'),
-					status_text: obj[item.status]
+					status_text: obj[item.status],
+					type_text: obj2[item.discountType]
 				}
 			});
 			if (page >= 2) {

pages/goods/components/detail/detail-tabbar.vue

@@ -2,50 +2,29 @@
 	<su-fixed bottom placeholder bg="bg-white">
 		<view class="ui-tabbar-box">
 			<view class="ui-tabbar ss-flex ss-col-center ss-row-between">
-        <view
-          v-if="collectIcon"
-          class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
-          @tap="onFavorite"
-        >
+				<view v-if="collectIcon" class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
+					@tap="onFavorite">
 					<block v-if="modelValue.favorite">
-            <image
-              class="item-icon"
-              :src="sheep.$url.static('/static/img/shop/goods/collect_1.gif')"
-              mode="aspectFit"
-            ></image>
+						<image class="item-icon" :src="sheep.$url.static('/static/img/shop/goods/collect_1.gif')"
+							mode="aspectFit"></image>
 						<view class="item-title">已收藏</view>
 					</block>
 					<block v-else>
-            <image
-              class="item-icon"
-              :src="sheep.$url.static('/static/img/shop/goods/collect_0.png')"
-              mode="aspectFit"
-            ></image>
+						<image class="item-icon" :src="sheep.$url.static('/static/img/shop/goods/collect_0.png')"
+							mode="aspectFit"></image>
 						<view class="item-title">收藏</view>
 					</block>
 				</view>
-        <view
-          v-if="serviceIcon"
-          class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
-          @tap="onChat"
-        >
-          <image
-            class="item-icon"
-            :src="sheep.$url.static('/static/img/shop/goods/message.png')"
-            mode="aspectFit"
-          ></image>
+				<view v-if="serviceIcon" class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
+					@tap="onChat">
+					<image class="item-icon" :src="sheep.$url.static('/static/img/shop/goods/message.png')"
+						mode="aspectFit"></image>
 					<view class="item-title">客服</view>
 				</view>
-        <view
-          v-if="shareIcon"
-          class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
-          @tap="showShareModal"
-        >
-          <image
-            class="item-icon"
-            :src="sheep.$url.static('/static/img/shop/goods/share.png')"
-            mode="aspectFit"
-          ></image>
+				<view v-if="shareIcon" class="detail-tabbar-item ss-flex ss-flex-col ss-row-center ss-col-center"
+					@tap="showShareModal">
+					<image class="item-icon" :src="sheep.$url.static('/static/img/shop/goods/share.png')"
+						mode="aspectFit"></image>
 					<view class="item-title">分享</view>
 				</view>
 				<slot></slot>
@@ -67,9 +46,14 @@
 	 *
 	 */
 
-  import { computed, reactive } from 'vue';
+	import {
+		computed,
+		reactive
+	} from 'vue';
 	import sheep from '@/sheep';
-  import { showShareModal } from '@/sheep/hooks/useModal';
+	import {
+		showShareModal
+	} from '@/sheep/hooks/useModal';
 
 	// 数据
 	const state = reactive({});
@@ -78,7 +62,7 @@
 	const props = defineProps({
 		modelValue: {
 			type: Object,
-      default() {},
+			default () {},
 		},
 		bg: {
 			type: String,
@@ -86,7 +70,7 @@
 		},
 		bgStyles: {
 			type: Object,
-      default() {},
+			default () {},
 		},
 		ui: {
 			type: String,
@@ -126,13 +110,22 @@
 		uni.setStorageSync('tabbar', e);
 	};
 	async function onFavorite() {
-    const { error } = await sheep.$api.user.favorite.do(props.modelValue.id);
-    if (error === 0) {
+		// const { error } = await sheep.$api.user.favorite.do(props.modelValue.id);
+		// if (error === 0) {
+		//   if (props.modelValue.favorite) {
+		//     props.modelValue.favorite = 0;
+		//   } else {
+		//     props.modelValue.favorite = 1;
+		//   }
+		// }
+		let data;
 		if (props.modelValue.favorite) {
-        props.modelValue.favorite = 0;
+			data = await sheep.$api.user.favorite.dos(props.modelValue.id);
 		} else {
-        props.modelValue.favorite = 1;
+			data = await sheep.$api.user.favorite.do(props.modelValue.id);
 		}
+		if (data.data) {
+			props.modelValue.favorite = !props.modelValue.favorite;
 		}
 	}
 
@@ -147,6 +140,7 @@
 	.ui-tabbar-box {
 		box-shadow: 0px -6px 10px 0px rgba(51, 51, 51, 0.2);
 	}
+
 	.ui-tabbar {
 		display: flex;
 		height: 50px;

pages/goods/index.vue

@@ -12,9 +12,7 @@
 			<block v-else>
 				<view class="detail-swiper-selector">
 					<!-- 商品轮播图  -->
-					<su-swiper class="ss-m-b-14" isPreview :list="formatGoodsSwiper(state.goodsInfo.sliderPicUrls)"
-                     dotStyle="tag" imageMode="widthFix" dotCur="bg-mask-40" :seizeHeight="750" />
-
+					<su-swiper class="ss-m-b-14" isPreview :list="formatGoodsSwiper(state.goodsInfo.sliderPicUrls)" dotStyle="tag" imageMode="widthFix" dotCur="bg-mask-40" :seizeHeight="750" />
 					<!-- 价格+标题 -->
 					<view class="title-card detail-card ss-p-y-40 ss-p-x-20">
 						<view class="ss-flex ss-row-between ss-col-center ss-m-b-26">
@@ -32,6 +30,8 @@
 						</view>
 						<view class="discounts-box ss-flex ss-row-between ss-m-b-28">
 							<!-- 满减送/限时折扣活动的提示 TODO 芋艿：promos 未写 -->
+							<div class="tag-content">
+              <!-- 满减送/限时折扣活动的提示 TODO 芋艿：promos 未写 -->
               <div class="tag-content">
 								<view class="tag-box ss-flex">
 									<view class="tag ss-m-r-10" v-for="promos in state.goodsInfo.promos" :key="promos.id" @tap="onActivity">
@@ -39,7 +39,6 @@
 									</view>
 								</view>
 							</div>
-
 							<!-- 优惠劵 -->
 							<view class="get-coupon-box ss-flex ss-col-center ss-m-l-20" @tap="state.showModel = true"
 								v-if="state.couponInfo.length">
@@ -87,12 +86,13 @@
 						<button class="ss-reset-button disabled-btn" disabled> 已售罄 </button>
 					</view>
 				</detail-tabbar>
-
 				<!-- 优惠劵弹窗 -->
-				<s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false"
-                      @get="onGet" />
+				<s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false" @get="onGet" />
 
 				<!-- 满减送/限时折扣活动弹窗 -->
+        		<!-- 优惠劵弹窗 -->
+				<s-coupon-get v-model="state.couponInfo" :show="state.showModel" @close="state.showModel = false" @get="onGet" />
+       			 <!-- 满减送/限时折扣活动弹窗 -->
 				<s-activity-pop v-model="state.activityInfo" :show="state.showActivityModel"
                         @close="state.showActivityModel = false" />
 			</block>
@@ -106,6 +106,13 @@
 	import sheep from '@/sheep';
 	import CouponApi from '@/sheep/api/promotion/coupon';
 	import ActivityApi from '@/sheep/api/promotion/activity';
+	import {
+		formatSales,
+		formatGoodsSwiper,
+		fen2yuan,
+	} from '@/sheep/hooks/useGoods';
+    import CouponApi from '@/sheep/api/promotion/coupon';
+    import ActivityApi from '@/sheep/api/promotion/activity';
     import { formatSales, formatGoodsSwiper, fen2yuan, } from '@/sheep/hooks/useGoods';
 	import detailNavbar from './components/detail/detail-navbar.vue';
 	import detailCellSku from './components/detail/detail-cell-sku.vue';
@@ -138,8 +145,9 @@
 		state.selectedSku = e;
 	}
 
-	// 添加购物车
+	// 添加购物车  TODO 芋艿：待测试
 	function onAddCart(e) {
+		console.log(e, '加入购物车');
 		sheep.$store('cart').add(e);
 	}
 
@@ -166,10 +174,10 @@
 	// 立即领取  TODO 芋艿：待测试
 	async function onGet(id) {
 		const {
-			error,
+			code,
 			msg
 		} = await sheep.$api.coupon.get(id);
-		if (error === 0) {
+		if (code === 0) {
 			uni.showToast({
 				title: msg,
 			});
@@ -180,6 +188,7 @@
 	}
 
   //  TODO 芋艿：待测试
+
 	const shareInfo = computed(() => {
 		if (isEmpty(state.goodsInfo)) return {};
 		return sheep.$platform.share.getShareInfo({
@@ -207,6 +216,75 @@
 		}
 		state.goodsId = options.id;
 		// 1. 加载商品信息
+		sheep.$api.goods.detail(state.goodsId).then(async (res) => {
+			// 未找到商品
+			if (res.code !== 0 || !res.data) {
+				state.goodsInfo = null;
+				return;
+			}
+			// 加载到商品
+			state.skeletonLoading = false;
+			// 获取收藏信息
+			let dasa = await sheep.$api.goods.exits(options.id);
+			res.data.favorite = dasa.data;
+			state.goodsInfo = res.data;
+			console.log(state.goodsInfo, '商品信息');
+
+			// 此处调试默认弹出可以修改为点击弹出
+			// 2. 加载优惠劵信息
+			CouponApi.getCouponTemplateList({
+				price: state.goodsInfo.price,
+				spuIds: [state.goodsInfo.id],
+				skuIds: state.goodsInfo.skus.map(item => item.id),
+				// 先写死
+				categoryIds: [52]
+			}).then((res) => {
+				console.log(res, '优惠券信息进行对接')
+				if (res.code !== 0) {
+					return;
+				}
+				// 拦截修改数据
+				let obj2 = {
+					2: '折扣',
+					1: '满减'
+				}
+				let obj = {
+					1: '可用',
+					2: '已用',
+					3: '过期'
+				}
+				let obj3 = {
+					1: '已领取',
+					2: '已使用',
+					3: '已过期'
+				}
+				res.data = res.data.map(item => {
+					return {
+						...item,
+						enough: (item.usePrice / 100).toFixed(2),
+						amount: (item.discountPrice / 100).toFixed(2),
+						use_start_time: sheep.$helper.timeFormat(item
+							.validStartTime,
+							'yyyy-mm-dd hh:MM:ss'),
+						use_end_time: sheep.$helper.timeFormat(item.validEndTime,
+							'yyyy-mm-dd hh:MM:ss'),
+						status_text: obj[item.status],
+						type_text: obj2[item.discountType],
+						get_status_text: obj3[item.status],
+						type_text: obj2[item.discountType]
+					}
+				});
+				state.couponInfo = res.data;
+			});
+		});
+		// return;
+		// 3. 加载营销活动信息
+		ActivityApi.getActivityListBySpuId(state.goodsId).then((res) => {
+			if (res.code !== 0) {
+				return;
+			}
+			state.activityList = res.data;
+		});
 		sheep.$api.goods.detail(state.goodsId).then((res) => {
       // 未找到商品
       if (res.code !== 0 || !res.data) {

pages/index/user.vue

@@ -1,12 +1,7 @@
 <template>
-  <s-layout
-    title="我的"
-    tabbar="/pages/index/user"
-    navbar="custom"
-    :bgStyle="template.page"
-    :navbarStyle="template.style?.navbar"
-    onShareAppMessage
-  >
+
+	<s-layout title="我的" tabbar="/pages/index/user" navbar="custom" :bgStyle="template.page"
+		:navbarStyle="template.style?.navbar" onShareAppMessage>
 		<s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
 			<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
 		</s-block>
@@ -14,8 +9,14 @@
 </template>
 
 <script setup>
-  import { computed } from 'vue';
-  import { onShow, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app';
+	import {
+		computed
+	} from 'vue';
+	import {
+		onShow,
+		onPageScroll,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app';
 	import sheep from '@/sheep';
 
 	// 隐藏原生tabBar
@@ -30,7 +31,7 @@
 
 	onPullDownRefresh(() => {
 		sheep.$store('user').updateUserData();
-    setTimeout(function () {
+		setTimeout(function() {
 			uni.stopPullDownRefresh();
 		}, 800);
 	});

sheep/api/cart.js

@@ -1,10 +1,9 @@
 import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
 
 export default {
 	list: (data) =>
-		request2({
-			url: 'trade/cart/list',
+		request({
+			url: '/app-api/trade/cart/list',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -13,7 +12,7 @@ export default {
 		}),
 	append: (data) =>
 		request({
-			url: 'cart',
+			url: '/app-api/trade/cart/add',
 			method: 'POST',
       // TODO 芋艿：这里没提示
 			custom: {
@@ -22,18 +21,31 @@ export default {
 			},
 			data: {
 				...data,
-				type: 'inc',
+				// type: 'inc',
 			},
 		}),
+	// append: (data) =>
+	// 	request({
+	// 		url: 'cart',
+	// 		method: 'POST',
+	// 		custom: {
+	// 			showSuccess: true,
+	// 			successMsg: '已添加到购物车~',
+	// 		},
+	// 		data: {
+	// 			...data,
+	// 			type: 'inc',
+	// 		},
+	// 	}),
 	// 删除购物车
 	delete: (ids) =>
-		request2({
-			url: 'trade/cart/delete?ids=' + ids,
+		request({
+			url: '/app-api/trade/cart/delete?ids=' + ids,
 			method: 'DELETE',
 		}),
 	update: (data) =>
-		request2({
-			url: 'trade/cart/update-count',
+		request({
+			url: '/app-api/trade/cart/update-count',
 			method: 'PUT',
 			data: {
 				...data,

sheep/api/category.js

@@ -1,9 +1,7 @@
-import request2 from '@/sheep/request2';
-
 export default {
 	list: (params) =>
-    request2({
-      url: 'product/category/list',
+		request({
+			url: '/app-api/product/category/list',
 			method: 'GET',
 			params,
 		}),

sheep/api/coupon.js

@@ -1,5 +1,4 @@
 import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
 
 export default {
 	// 我的拼团
@@ -13,8 +12,8 @@ export default {
 			},
 		}),
 	userCoupon: (params) =>
-		request2({
-			url: 'promotion/coupon/page',
+		request({
+			url: '/app-api/promotion/coupon/page',
 			method: 'GET',
 			params,
 		}),
@@ -34,9 +33,20 @@ export default {
 		}),
 	get: (id) =>
 		request({
-			url: 'coupon/get/' + id,
+			url: '/app-api/promotion/coupon/take',
 			method: 'POST',
+			data: {
+				templateId: id
+			},
+			params: {
+				templateId: id
+			},
 		}),
+	// get: (id) =>
+	// 	request({
+	// 		url: 'coupon/get/' + id,
+	// 		method: 'POST',
+	// 	}),
 	listByGoods: (id) =>
 		request({
 			url: 'coupon/listByGoods/' + id,

sheep/api/data.js

@@ -1,10 +1,9 @@
 import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
 
 export default {
 	area: () =>
-    request2({
-      url: 'system/area/tree',
+		request({
+			url: '/app-api/system/area/tree',
 			method: 'GET',
 		}),
 	// area: () =>

sheep/api/goods.js

@@ -1,11 +1,10 @@
 import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
 
 export default {
 	// 商品详情
 	detail: (id, params = {}) =>
-    request2({
-      url: 'product/spu/get-detail?id=' + id,
+		request({
+			url: '/app-api/product/spu/get-detail?id=' + id,
 			method: 'GET',
 			params,
 			custom: {
@@ -16,8 +15,8 @@ export default {
 
 	// 商品列表
 	list: (params) =>
-    request2({
-      url: 'product/spu/page',
+		request({
+			url: '/app-api/product/spu/page',
 			method: 'GET',
 			params,
 			custom: {
@@ -37,11 +36,10 @@ export default {
 				showError: false,
 			},
 		}),
-
 	// 商品评价列表
 	comment: (id, params = {}) =>
-    request2({
-      url: 'product/comment/list?spuId=' + id,
+		request({
+			url: '/app-api/product/comment/list?spuId=' + id,
 			method: 'GET',
 			params,
 			custom: {
@@ -77,4 +75,10 @@ export default {
 			method: 'GET',
 			params,
 		}),
+	// 检查是否收藏商品
+	exits: (id) =>
+		request({
+			url: '/app-api/product/favorite/exits?spuId=' + id,
+			method: 'GET',
+		}),
 };

sheep/api/index2.js

@@ -1,14 +1,14 @@
-import request2 from '@/sheep/request2';
+import request from '@/sheep/request';
 
 export default {
 	decorate: () =>
-    request2({
-      url: 'promotion/decorate/list?page=1',
+		request({
+			url: '/app-api/promotion/decorate/list?page=1',
 			method: 'GET',
 		}),
 	spids: () =>
-    request2({
-      url: 'product/spu/page?recommendType=best&pageNo=1&pageSize=10',
+		request({
+			url: '/app-api/product/spu/page?recommendType=best&pageNo=1&pageSize=10',
 			method: 'GET',
 		}),
 };

sheep/api/order.js

@@ -1,11 +1,10 @@
 import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
 
 export default {
 	// 订单详情
 	detail: (id, params) =>
-		request2({
-			url: 'trade/order/get-detail?id=' + id,
+		request({
+			url: '/app-api/trade/order/get-detail?id=' + id,
 			method: 'GET',
 			params,
 		}),
@@ -40,8 +39,8 @@ export default {
 		}),
 	// 订单列表
 	list: (params) =>
-		request2({
-			url: 'trade/order/page',
+		request({
+			url: '/app-api/trade/order/page',
 			method: 'GET',
 			params,
 			custom: {
@@ -65,16 +64,25 @@ export default {
 		// 解决 SpringMVC 接受 List<Item> 参数的问题
 		delete data2.items
 		for (let i = 0; i < data.items.length; i++) {
+			// 此处转码问题,待解决方案
 			data2[encodeURIComponent('items[' + i + '' + '].skuId')] = data.items[i].skuId + '';
 			data2[encodeURIComponent('items[' + i + '' + '].count')] = data.items[i].count + '';
-      if (data.items[i].cartId) {
 			data2[encodeURIComponent('items[' + i + '' + '].cartId')] = data.items[i].cartId + '';
+
+			// data2['items' + `[${i}]` + '.skuId'] = data.items[i].skuId + '';
+			// data2['items' + `[${i}]` + '.count'] = data.items[i].count + '';
+			// data2['items' + `[${i}]` + '.cartId'] = data.items[i].cartId + '';
+
+			// data2['items' + `%5B${i}%5D` + '.skuId'] = data.items[i].skuId + '';
+			// data2['items' + `%5B${i}%5D` + '.count'] = data.items[i].count + '';
+			// data2['items' + `%5B${i}%5D` + '.cartId'] = data.items[i].cartId + '';
 		}
-		}
-    const queryString= Object.keys(data2).map(key => key + '=' + data2[key]).join('&')
-		return request2({
-			url: `trade/order/settlement?${queryString}`,
-			method: 'GET'
+		console.log(data2, '手动转码的参数')
+		return request({
+			url: '/app-api/trade/order/settlement',
+			method: 'GET',
+			// data: data2,
+			params: data2
 		})
 	},
 	// 创建订单
@@ -99,8 +107,8 @@ export default {
 		}),
 	// 评价订单
 	comment: (data) =>
-		request2({
-			url: 'trade/order/item/create-comment',
+		request({
+			url: '/app-api/trade/order/item/create-comment',
 			method: 'POST',
 			data,
 		}),
@@ -138,8 +146,8 @@ export default {
 				data,
 			}),
 		list: (params) =>
-			request2({
-				url: 'trade/after-sale/page',
+			request({
+				url: '/app-api/trade/after-sale/page',
 				method: 'GET',
 				params,
 				custom: {
@@ -169,8 +177,8 @@ export default {
 			}),
 		// 售后详情
 		detail: (id) =>
-			request2({
-				url: 'trade/after-sale/get?id=' + id,
+			request({
+				url: '/app-api/trade/after-sale/get?id=' + id,
 				method: 'GET',
 			}),
 	},

sheep/api/product/comment.js

@@ -1,6 +1,7 @@
 import request from '@/sheep/request';
 
 const CommentApi = {
+
 	// 获得商品评价分页
 	getCommentPage: (spuId, pageNo, pageSize, type) => {
 		return request({

sheep/api/promotion/activity.js

@@ -1,9 +1,9 @@
-import request2 from '@/sheep/request2';
+import request from '@/sheep/request';
 
 const ActivityApi = {
 	// 获得单个商品，近期参与的每个活动
 	getActivityListBySpuId: (spuId) => {
-    return request2({
+		return request({
 			url: '/app-api/promotion/activity/list-by-spu-id',
 			method: 'GET',
 			params: {

sheep/api/promotion/combination.js

@@ -1,20 +1,22 @@
-import request2 from "@/sheep/request2";
+import request from "@/sheep/request";
 
 // 拼团 API
 const CombinationApi = {
 	// 获得拼团活动列表
 	getCombinationActivityList: (count) => {
-        return request2({
-            url: "promotion/combination-activity/list",
+		return request({
+			url: "/app-api/promotion/combination-activity/list",
 			method: 'GET',
-            params: {count}
+			params: {
+				count
+			}
 		});
 	},
 
 	// 获得拼团活动分页
 	getCombinationActivityPage: (params) => {
-        return request2({
-            url: "promotion/combination-activity/page",
+		return request({
+			url: "/app-api/promotion/combination-activity/page",
 			method: 'GET',
 			params
 		});
@@ -22,8 +24,8 @@ const CombinationApi = {
 
 	// 获得拼团活动明细
 	getCombinationActivity: (id) => {
-        return request2({
-            url: "promotion/combination-activity/get-detail",
+		return request({
+			url: "/app-api/promotion/combination-activity/get-detail",
 			method: 'GET',
 			params: {
 				id
@@ -33,8 +35,8 @@ const CombinationApi = {
 
 	// 获得最近 n 条拼团记录（团长发起的）
 	getHeadCombinationRecordList: (activityId, status, count) => {
-        return request2({
-            url: "promotion/combination-record/get-head-list",
+		return request({
+			url: "/app-api/promotion/combination-record/get-head-list",
 			method: 'GET',
 			params: {
 				activityId,
@@ -46,8 +48,8 @@ const CombinationApi = {
 
 	// 获得拼团记录明细
 	getCombinationRecordDetail: (id) => {
-        return request2({
-            url: "promotion/combination-record/get-detail",
+		return request({
+			url: "/app-api/promotion/combination-record/get-detail",
 			method: 'GET',
 			params: {
 				id
@@ -57,8 +59,8 @@ const CombinationApi = {
 
 	// 获得拼团记录的概要信息
 	getCombinationRecordSummary: () => {
-        return request2({
-            url: "promotion/combination-record/get-summary",
+		return request({
+			url: "/app-api/promotion/combination-record/get-summary",
 			method: 'GET',
 		});
 	}

sheep/api/promotion/seckill.js

@@ -1,19 +1,28 @@
-import request2 from "@/sheep/request2";
+import request from "@/sheep/request";
 
 const SeckillApi = {
 	// 获得秒杀时间段列表
 	getSeckillConfigList: () => {
-    return request2({ url: 'promotion/seckill-config/list', method: 'GET' });
+		return request({
+			url: '/app-api/promotion/seckill-config/list',
+			method: 'GET'
+		});
 	},
 
 	// 获得当前秒杀活动
 	getNowSeckillActivity: () => {
-    return request2({ url: 'promotion/seckill-activity/get-now', method: 'GET' });
+		return request({
+			url: '/app-api/promotion/seckill-activity/get-now',
+			method: 'GET'
+		});
 	},
 
 	// 获得秒杀活动分页
 	getSeckillActivityPage: () => {
-    return request2({ url: 'promotion/seckill-activity/page', method: 'GET' });
+		return request({
+			url: '/app-api/promotion/seckill-activity/page',
+			method: 'GET'
+		});
 	},
 
 	/**
@@ -22,10 +31,12 @@ const SeckillApi = {
 	 * @return {*}
 	 */
 	getSeckillActivity: (id) => {
-    return request2({
-      url: 'promotion/seckill-activity/get-detail',
+		return request({
+			url: '/app-api/promotion/seckill-activity/get-detail',
 			method: 'GET',
-      params: { id }
+			params: {
+				id
+			}
 		});
 	}
 }

sheep/api/user.js

@@ -1,11 +1,10 @@
 import request from '@/sheep/request';
-import request2 from '@/sheep/request2';
 import $platform from '@/sheep/platform';
 
 export default {
 	getUnused: () =>
-		request2({
-			url: 'promotion/coupon/get-unused-count',
+		request({
+			url: '/app-api/promotion/coupon/get-unused-count',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -13,8 +12,8 @@ export default {
 			},
 		}),
 	profile: () =>
-		request2({
-			url: 'member/user/get',
+		request({
+			url: '/app-api/member/user/get',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -22,7 +21,7 @@ export default {
 			},
 		}),
 	balance: () =>
-		request2({
+		request({
 			url: '/app-api/pay/wallet/get',
 			method: 'GET',
 			custom: {
@@ -30,28 +29,9 @@ export default {
 				auth: true,
 			},
 		}),
-	// profile: () =>
-	//   request({
-	//     url: '/user/api/user/profile',
-	//     method: 'GET',
-	//     custom: {
-	//       showLoading: false,
-	//       auth: true,
-	//     },
-	//   }),
-	// update: (data) =>
-	//   request({
-	//     url: '/user/api/user/update',
-	//     method: 'POST',
-	//     custom: {
-	//       showSuccess: true,
-	//       auth: true,
-	//     },
-	//     data,
-	//   }),
 	update: (data) =>
-		request2({
-			url: 'member/user/update',
+		request({
+			url: '/app-api/member/user/update',
 			method: 'PUT',
 			custom: {
 				showSuccess: true,
@@ -196,90 +176,48 @@ export default {
 		}),
 
 	address: {
-		// default: () =>
-		// 	request({
-		// 		url: 'user/address/default',
-		// 		method: 'GET',
-		// 		custom: {
-		// 			showError: false,
-		// 		},
-		// 	}),
 		default: () =>
-			request2({
-				url: 'member/address/get-default',
+			request({
+				url: '/app-api/member/address/get-default',
 				method: 'GET',
 				custom: {
 					showError: false,
 				},
 			}),
 		list: () =>
-			request2({
-				url: 'member/address/list',
+			request({
+				url: '/app-api/member/address/list',
 				method: 'GET',
 				custom: {},
 			}),
-		// list: () =>
-		//   request({
-		//     url: 'user/address',
-		//     method: 'GET',
-		//     custom: {},
-		//   }),
 		create: (data) =>
-			request2({
-				url: 'member/address/create',
+			request({
+				url: '/app-api/member/address/create',
 				method: 'POST',
 				data,
 				custom: {
 					showSuccess: true,
 				},
 			}),
-		// create: (data) =>
-		//   request({
-		//     url: 'user/address',
-		//     method: 'POST',
-		//     data,
-		//     custom: {
-		//       showSuccess: true,
-		//     },
-		//   }),
 		update: (data) =>
-			request2({
-				url: 'member/address/update',
+			request({
+				url: '/app-api/member/address/update',
 				method: 'PUT',
 				data,
 				custom: {
 					showSuccess: true,
 				},
 			}),
-		// update: (id, data) =>
-		// 	request({
-		// 		url: 'user/address/' + id,
-		// 		method: 'PUT',
-		// 		data,
-		// 		custom: {
-		// 			showSuccess: true,
-		// 		},
-		// 	}),
 		detail: (id) =>
-			request2({
-				url: 'member/address/get?id=' + id,
+			request({
+				url: '/app-api/member/address/get?id=' + id,
 				method: 'GET',
 			}),
-		// detail: (id) =>
-		//   request({
-		//     url: 'user/address/' + id,
-		//     method: 'GET',
-		//   }),
 		delete: (id) =>
-			request2({
-				url: 'member/address/delete?id=' + id,
+			request({
+				url: '/app-api/member/address/delete?id=' + id,
 				method: 'DELETE',
 			}),
-		// delete: (id) =>
-		// 	request({
-		// 		url: 'user/address/' + id,
-		// 		method: 'DELETE',
-		// 	}),
 	},
 	invoice: {
 		list: () =>
@@ -319,17 +257,29 @@ export default {
 	},
 	favorite: {
 		list: (params) =>
-			request2({
-				url: 'product/favorite/page',
+			request({
+				url: '/app-api/product/favorite/page',
 				method: 'GET',
 				params,
 			}),
 		do: (id) =>
 			request({
-				url: 'user/goodsLog/favorite',
+				url: '/app-api/product/favorite/create',
 				method: 'POST',
 				data: {
-					goods_id: id,
+					spuId: id,
+				},
+				custom: {
+					showSuccess: true,
+					auth: true,
+				},
+			}),
+		dos: (id) =>
+			request({
+				url: '/app-api/product/favorite/delete',
+				method: 'DELETE',
+				data: {
+					spuId: id,
 				},
 				custom: {
 					showSuccess: true,
@@ -338,8 +288,8 @@ export default {
 			}),
 		// 取消收藏
 		cancel: (id) =>
-			request2({
-				url: 'product/favorite/delete-list',
+			request({
+				url: '/app-api/product/favorite/delete-list',
 				method: 'DELETE',
 				data: {
 					spuIds: id.split(',').map(item => item * 1),
@@ -350,18 +300,6 @@ export default {
 					auth: true,
 				},
 			}),
-		// cancel: (id) =>
-		//   request({
-		//     url: 'user/goodsLog/favorite',
-		//     method: 'POST',
-		//     data: {
-		//       goods_ids: id,
-		//     },
-		//     custom: {
-		//       showSuccess: true,
-		//       auth: true,
-		//     },
-		//   }),
 	},
 	view: {
 		list: (params) =>
@@ -383,28 +321,21 @@ export default {
 	},
 	wallet: {
 		log: (params) =>
-			request2({
+			request({
 				// url: 'member/point/record/page',
-				url: 'pay/wallet-transaction/page',
+				url: '/app-api/pay/wallet-transaction/page',
 				method: 'GET',
 				params,
 				custom: {},
 			}),
 		log2: (params) =>
-			request2({
-				url: 'member/point/record/page',
+			request({
+				url: '/app-api/member/point/record/page',
 				// url: 'pay/wallet-transaction/page',
 				method: 'GET',
 				params,
 				custom: {},
 			}),
-		// log: (params) =>
-		// request({
-		// 	url: '/user/api/walletLog',
-		// 	method: 'GET',
-		// 	params,
-		// 	custom: {},
-		// }),
 	},
 	account: {
 		info: (params) =>
@@ -429,18 +360,9 @@ export default {
 			}),
 	},
 	//数量接口
-	// data: () =>
-	//   request({
-	//     url: 'user/user/data',
-	//     method: 'GET',
-	//     custom: {
-	//       showLoading: false,
-	//       auth: true,
-	//     },
-	//   }),
 	data: () =>
-		request2({
-			url: 'trade/order/get-count',
+		request({
+			url: '/app-api/trade/order/get-count',
 			method: 'GET',
 			custom: {
 				showLoading: false,
@@ -448,8 +370,8 @@ export default {
 			},
 		}),
 	data2: () =>
-		request2({
-			url: 'trade/after-sale/get-applying-count',
+		request({
+			url: '/app-api/trade/after-sale/get-applying-count',
 			method: 'GET',
 			custom: {
 				showLoading: false,

sheep/components/s-coupon-get/s-coupon-get.vue

@@ -1,32 +1,17 @@
 <template>
-  <su-popup
-    :show="show"
-    type="bottom"
-    round="20"
-    @close="emits('close')"
-    showClose
-    backgroundColor="#f2f2f2"
-  >
+	<su-popup :show="show" type="bottom" round="20" @close="emits('close')" showClose backgroundColor="#f2f2f2">
 		<view class="model-box">
 			<view class="title ss-m-t-16 ss-m-l-20 ss-flex">优惠券</view>
-      <scroll-view
-        class="model-content"
-        scroll-y
-        :scroll-with-animation="false"
-        :enable-back-to-top="true"
-      >
+			<scroll-view class="model-content" scroll-y :scroll-with-animation="false" :enable-back-to-top="true">
 				<view class="subtitle ss-m-l-20">可使用优惠券</view>
 				<view v-for="item in state.couponInfo" :key="item.id">
 					<s-coupon-list :data="item">
 						<template #default>
-              <button
-                class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center"
-                :class="
+							<button class="ss-reset-button card-btn ss-flex ss-row-center ss-col-center" :class="
                   item.get_status != 'can_get' && item.get_status != 'can_use' ? 'boder-btn' : ''
-                "
-                @click.stop="getBuy(item.id)"
-                :disabled="item.get_status != 'can_get' && item.get_status != 'can_use'"
-              >
+                " @click.stop="getBuy(item.id)">
+								<!-- 此处对接领取优惠券先将限制解除 -->
+								<!-- :disabled="item.get_status != 'can_get' && item.get_status != 'can_use'" -->
 								{{ item.get_status_text }}
 							</button>
 						</template>
@@ -37,11 +22,14 @@
 	</su-popup>
 </template>
 <script setup>
-  import { computed, reactive } from 'vue';
+	import {
+		computed,
+		reactive
+	} from 'vue';
 	const props = defineProps({
 		modelValue: {
 			type: Object,
-      default() {},
+			default () {},
 		},
 		show: {
 			type: Boolean,
@@ -55,6 +43,7 @@
 		couponId: '',
 	});
 	const getBuy = (id) => {
+		console.log('应该是详情页领取优惠券')
 		emits('get', id);
 	};
 	//立即领取
@@ -62,26 +51,31 @@
 <style lang="scss" scoped>
 	.model-box {
 		height: 60vh;
+
 		.title {
 			font-size: 36rpx;
 			height: 80rpx;
 			font-weight: bold;
 			color: #333333;
 		}
+
 		.subtitle {
 			font-size: 26rpx;
 			font-weight: 500;
 			color: #333333;
 		}
 	}
+
 	.model-content {
 		height: 54vh;
 	}
+
 	.modal-footer {
 		width: 100%;
 		height: 120rpx;
 		background: #fff;
 	}
+
 	.confirm-btn {
 		width: 710rpx;
 		margin-left: 20rpx;
@@ -90,6 +84,7 @@
 		border-radius: 40rpx;
 		color: #fff;
 	}
+
 	// 优惠券按钮
 	.card-btn {
 		// width: 144rpx;
@@ -101,6 +96,7 @@
 		font-size: 24rpx;
 		font-weight: 400;
 	}
+
 	.boder-btn {
 		background: linear-gradient(90deg, var(--ui-BG-Main-opacity-4), var(--ui-BG-Main-light));
 		color: #fff !important;

sheep/components/s-coupon-list/s-coupon-list.vue

@@ -1,13 +1,9 @@
 <template>
 	<view class="ss-m-20" :style="{ opacity: disabled ? '0.5' : '1' }">
 		<view class="content">
-			<!--      <view
-        class="tag ss-flex ss-row-center"
-        :class="
+			<view class="tag ss-flex ss-row-center" :class="
           data.status == 'expired' || data.status == 'used' ? 'disabled-bg-color' : 'info-bg-color'
-        "
-        >{{ data.type_text }}</view
-      > -->
+        ">{{ data.type_text }}</view>
 			<view class="title ss-m-x-30 ss-p-t-18">
 				<view class="ss-flex ss-row-between">
 					<view class="value-text ss-flex-1 ss-m-r-10" :class="

sheep/request2/index.js

@@ -55,7 +55,8 @@ const http = new Request({
 	method: 'GET',
 	header: {
 		Accept: 'text/json',
-		'Content-Type': 'application/json;charset=UTF-8',
+		'Content-Type': 'application/json',
+		// ;charset=UTF-8
 		platform: $platform.name,
 	},
 	// #ifdef APP-PLUS
@@ -97,6 +98,7 @@ http.interceptors.request.use(
 			config.header['tenant-id'] = '1';
 			config.header['Authorization'] = 'Bearer test247';
 		}
+		// console.log(config, '看参数')
 		return config;
 	},
 	(error) => {

uni_modules/mp-html/components/mp-html/parser.js

@@ -5,7 +5,9 @@
 // 配置
 const config = {
 	// 信任的标签（保持标签名不变）
-  trustTags: makeMap('a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,ruby,rt,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video'),
+	trustTags: makeMap(
+		'a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,ruby,rt,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video'
+	),
 
 	// 块级标签（转为 div，其他的非信任标签转为 span）
 	blockTags: makeMap('address,article,aside,body,caption,center,cite,footer,header,html,nav,pre,section'),
@@ -16,10 +18,14 @@ const config = {
 	// #endif
 
 	// 要移除的标签
-  ignoreTags: makeMap('area,base,canvas,embed,frame,head,iframe,input,link,map,meta,param,rp,script,source,style,textarea,title,track,wbr'),
+	ignoreTags: makeMap(
+		'area,base,canvas,embed,frame,head,iframe,input,link,map,meta,param,rp,script,source,style,textarea,title,track,wbr'
+	),
 
 	// 自闭合的标签
-  voidTags: makeMap('area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr'),
+	voidTags: makeMap(
+		'area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr'
+	),
 
 	// html 实体
 	entities: {
@@ -74,7 +80,7 @@ const config = {
 		repeatdur: 'repeatDur'
 	}
 }
-const tagSelector={}
+const tagSelector = {}
 const {
 	windowWidth,
 	// #ifdef MP-WEIXIN
@@ -99,7 +105,7 @@ config.ignoreTags.style = undefined
  * @description 创建 map
  * @param {String} str 逗号分隔
  */
-function makeMap (str) {
+function makeMap(str) {
 	const map = Object.create(null)
 	const list = str.split(',')
 	for (let i = list.length; i--;) {
@@ -114,7 +120,7 @@ function makeMap (str) {
  * @param {Boolean} amp 要不要解码 &
  * @returns {String} 解码后的字符串
  */
-function decodeEntity (str, amp) {
+function decodeEntity(str, amp) {
 	let i = str.indexOf('&')
 	while (i !== -1) {
 		const j = str.indexOf(';', i + 3)
@@ -142,10 +148,11 @@ function decodeEntity (str, amp) {
  * @description 合并多个块级标签，加快长内容渲染
  * @param {Array} nodes 要合并的标签数组
  */
-function mergeNodes (nodes) {
+function mergeNodes(nodes) {
 	let i = nodes.length - 1
 	for (let j = i; j >= -1; j--) {
-    if (j === -1 || nodes[j].c || !nodes[j].name || (nodes[j].name !== 'div' && nodes[j].name !== 'p' && nodes[j].name[0] !== 'h') || (nodes[j].attrs.style || '').includes('inline')) {
+		if (j === -1 || nodes[j].c || !nodes[j].name || (nodes[j].name !== 'div' && nodes[j].name !== 'p' && nodes[j]
+				.name[0] !== 'h') || (nodes[j].attrs.style || '').includes('inline')) {
 			if (i - j >= 5) {
 				nodes.splice(j + 1, i - j, {
 					name: 'div',
@@ -162,7 +169,7 @@ function mergeNodes (nodes) {
  * @description html 解析器
  * @param {Object} vm 组件实例
  */
-function Parser (vm) {
+function Parser(vm) {
 	this.options = vm || {}
 	this.tagStyle = Object.assign({}, config.tagStyle, this.options.tagStyle)
 	this.imgList = vm.imgList || []
@@ -171,14 +178,15 @@ function Parser (vm) {
 	this.attrs = Object.create(null)
 	this.stack = []
 	this.nodes = []
-  this.pre = (this.options.containerStyle || '').includes('white-space') && this.options.containerStyle.includes('pre') ? 2 : 0
+	this.pre = (this.options.containerStyle || '').includes('white-space') && this.options.containerStyle.includes(
+		'pre') ? 2 : 0
 }
 
 /**
  * @description 执行解析
  * @param {String} content 要解析的文本
  */
-Parser.prototype.parse = function (content) {
+Parser.prototype.parse = function(content) {
 	// 插件处理
 	for (let i = this.plugins.length; i--;) {
 		if (this.plugins[i].onUpdate) {
@@ -200,7 +208,7 @@ Parser.prototype.parse = function (content) {
 /**
  * @description 将标签暴露出来（不被 rich-text 包含）
  */
-Parser.prototype.expose = function () {
+Parser.prototype.expose = function() {
 	// #ifndef APP-PLUS-NVUE
 	for (let i = this.stack.length; i--;) {
 		const item = this.stack[i]
@@ -215,7 +223,7 @@ Parser.prototype.expose = function () {
  * @param {Object} node 要处理的标签
  * @returns {Boolean} 是否要移除此标签
  */
-Parser.prototype.hook = function (node) {
+Parser.prototype.hook = function(node) {
 	for (let i = this.plugins.length; i--;) {
 		if (this.plugins[i].onParse && this.plugins[i].onParse(node, this) === false) {
 			return false
@@ -229,7 +237,7 @@ Parser.prototype.hook = function (node) {
  * @param {String} url 需要拼接的链接
  * @returns {String} 拼接后的链接
  */
-Parser.prototype.getUrl = function (url) {
+Parser.prototype.getUrl = function(url) {
 	const domain = this.options.domain
 	if (url[0] === '/') {
 		if (url[1] === '/') {
@@ -238,13 +246,15 @@ Parser.prototype.getUrl = function (url) {
 		} else if (domain) {
 			// 否则补充整个域名
 			url = domain + url
-    } /* #ifdef APP-PLUS */ else {
+		} /* #ifdef APP-PLUS */
+		else {
 			url = plus.io.convertLocalFileSystemURL(url)
 		} /* #endif */
 	} else if (!url.includes('data:') && !url.includes('://')) {
 		if (domain) {
 			url = domain + '/' + url
-    } /* #ifdef APP-PLUS */ else {
+		} /* #ifdef APP-PLUS */
+		else {
 			url = plus.io.convertLocalFileSystemURL(url)
 		} /* #endif */
 	}
@@ -256,7 +266,7 @@ Parser.prototype.getUrl = function (url) {
  * @param {Object} node 标签
  * @returns {Object}
  */
-Parser.prototype.parseStyle = function (node) {
+Parser.prototype.parseStyle = function(node) {
 	const attrs = node.attrs
 	const list = (this.tagStyle[node.name] || '').split(';').concat((attrs.style || '').split(';'))
 	const styleObj = {}
@@ -317,7 +327,7 @@ Parser.prototype.parseStyle = function (node) {
  * @param {String} name 标签名
  * @private
  */
-Parser.prototype.onTagName = function (name) {
+Parser.prototype.onTagName = function(name) {
 	this.tagName = this.xml ? name : name.toLowerCase()
 	if (this.tagName === 'svg') {
 		this.xml = (this.xml || 0) + 1 // svg 标签内大小写敏感
@@ -329,7 +339,7 @@ Parser.prototype.onTagName = function (name) {
  * @param {String} name 属性名
  * @private
  */
-Parser.prototype.onAttrName = function (name) {
+Parser.prototype.onAttrName = function(name) {
 	name = this.xml ? name : name.toLowerCase()
 	if (name.substr(0, 5) === 'data-') {
 		if (name === 'data-src' && !this.attrs.src) {
@@ -353,7 +363,8 @@ Parser.prototype.onAttrName = function (name) {
  * @param {String} val 属性值
  * @private
  */
-Parser.prototype.onAttrVal = function (val) {
+Parser.prototype.onAttrVal = function(val) {
+	// console.log(val, '解码转码')
 	const name = this.attrName || ''
 	if (name === 'style' || name === 'href') {
 		// 部分属性进行实体解码
@@ -371,7 +382,7 @@ Parser.prototype.onAttrVal = function (val) {
  * @param {Boolean} selfClose 是否有自闭合标识 />
  * @private
  */
-Parser.prototype.onOpenTag = function (selfClose) {
+Parser.prototype.onOpenTag = function(selfClose) {
 	// 拼装 node
 	const node = Object.create(null)
 	node.name = this.tagName
@@ -397,9 +408,11 @@ Parser.prototype.onOpenTag = function (selfClose) {
 		// #ifndef H5 || APP-PLUS
 		const src = attrs.src || ''
 		// 按照后缀名和 type 将 embed 转为 video 或 audio
-    if (src.includes('.mp4') || src.includes('.3gp') || src.includes('.m3u8') || (attrs.type || '').includes('video')) {
+		if (src.includes('.mp4') || src.includes('.3gp') || src.includes('.m3u8') || (attrs.type || '').includes(
+				'video')) {
 			node.name = 'video'
-    } else if (src.includes('.mp3') || src.includes('.wav') || src.includes('.aac') || src.includes('.m4a') || (attrs.type || '').includes('audio')) {
+		} else if (src.includes('.mp3') || src.includes('.wav') || src.includes('.aac') || src.includes('.m4a') || (
+				attrs.type || '').includes('audio')) {
 			node.name = 'audio'
 		}
 		if (attrs.autostart) {
@@ -439,7 +452,9 @@ Parser.prototype.onOpenTag = function (selfClose) {
 			// 通过 base 标签设置主域名
 			if (node.name === 'base' && !this.options.domain) {
 				this.options.domain = attrs.href
-      } /* #ifndef APP-PLUS-NVUE */ else if (node.name === 'source' && parent && (parent.name === 'video' || parent.name === 'audio') && attrs.src) {
+			} /* #ifndef APP-PLUS-NVUE */
+			else if (node.name === 'source' && parent && (parent.name === 'video' || parent.name === 'audio') &&
+				attrs.src) {
 				// 设置 source 标签（仅父节点为 video 或 audio 时有效）
 				parent.src.push(attrs.src)
 			} /* #endif */
@@ -476,7 +491,8 @@ Parser.prototype.onOpenTag = function (selfClose) {
 						}
 						// #ifndef H5 || APP-PLUS
 						const style = item.attrs.style || ''
-            if (style.includes('flex:') && !style.includes('flex:0') && !style.includes('flex: 0') && (!styleObj.width || parseInt(styleObj.width) > 100)) {
+						if (style.includes('flex:') && !style.includes('flex:0') && !style.includes('flex: 0') && (!
+								styleObj.width || parseInt(styleObj.width) > 100)) {
 							styleObj.width = '100% !important'
 							styleObj.height = ''
 							for (let j = i + 1; j < this.stack.length; j++) {
@@ -485,7 +501,8 @@ Parser.prototype.onOpenTag = function (selfClose) {
 						} else if (style.includes('flex') && styleObj.width === '100%') {
 							for (let j = i + 1; j < this.stack.length; j++) {
 								const style = this.stack[j].attrs.style || ''
-                if (!style.includes(';width') && !style.includes(' width') && style.indexOf('width') !== 0) {
+								if (!style.includes(';width') && !style.includes(' width') && style.indexOf(
+										'width') !== 0) {
 									styleObj.width = ''
 									break
 								}
@@ -548,7 +565,8 @@ Parser.prototype.onOpenTag = function (selfClose) {
 			if (!isNaN(parseInt(styleObj.width))) {
 				node.w = 'T'
 			}
-      if (!isNaN(parseInt(styleObj.height)) && (!styleObj.height.includes('%') || (parent && (parent.attrs.style || '').includes('height')))) {
+			if (!isNaN(parseInt(styleObj.height)) && (!styleObj.height.includes('%') || (parent && (parent.attrs
+					.style || '').includes('height')))) {
 				node.h = 'T'
 			}
 		} else if (node.name === 'svg') {
@@ -569,7 +587,8 @@ Parser.prototype.onOpenTag = function (selfClose) {
 		}
 		// #endif
 	} else {
-    if ((node.name === 'pre' || ((attrs.style || '').includes('white-space') && attrs.style.includes('pre'))) && this.pre !== 2) {
+		if ((node.name === 'pre' || ((attrs.style || '').includes('white-space') && attrs.style.includes('pre'))) &&
+			this.pre !== 2) {
 			this.pre = node.pre = 1
 		}
 		node.children = []
@@ -585,7 +604,7 @@ Parser.prototype.onOpenTag = function (selfClose) {
  * @param {String} name 标签名
  * @private
  */
-Parser.prototype.onCloseTag = function (name) {
+Parser.prototype.onCloseTag = function(name) {
 	// 依次出栈到匹配为止
 	name = this.xml ? name : name.toLowerCase()
 	let i
@@ -612,7 +631,7 @@ Parser.prototype.onCloseTag = function (name) {
  * @description 处理标签出栈
  * @private
  */
-Parser.prototype.popNode = function () {
+Parser.prototype.popNode = function() {
 	const node = this.stack.pop()
 	let attrs = node.attrs
 	const children = node.children
@@ -650,7 +669,7 @@ Parser.prototype.popNode = function () {
 			return
 		}
 		// #ifdef APP-PLUS-NVUE
-    (function traversal (node) {
+		(function traversal(node) {
 			if (node.name) {
 				// 调整 svg 的大小写
 				node.name = config.svgDict[node.name] || node.name
@@ -671,7 +690,7 @@ Parser.prototype.popNode = function () {
 		const style = attrs.style
 		attrs.style = ''
 		attrs.xmlns = 'http://www.w3.org/2000/svg';
-    (function traversal (node) {
+		(function traversal(node) {
 			if (node.type === 'text') {
 				src += node.text
 				return
@@ -745,7 +764,9 @@ Parser.prototype.popNode = function () {
 				} else if (size > 7) {
 					size = 7
 				}
-        styleObj['font-size'] = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', 'xxx-large'][size - 1]
+				styleObj['font-size'] = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large', 'xxx-large'][
+					size - 1
+				]
 			}
 			attrs.size = undefined
 		}
@@ -774,7 +795,8 @@ Parser.prototype.popNode = function () {
 
 	if (node.name === 'a' || node.name === 'ad'
 		// #ifdef H5 || APP-PLUS
-    || node.name === 'iframe' // eslint-disable-line
+		||
+		node.name === 'iframe' // eslint-disable-line
 		// #endif
 	) {
 		this.expose()
@@ -790,7 +812,8 @@ Parser.prototype.popNode = function () {
 			}
 		}
 		if (this.options.pauseVideo) {
-      str += ' onplay="this.dispatchEvent(new CustomEvent(\'vplay\',{bubbles:!0}));for(var e=document.getElementsByTagName(\'video\'),t=0;t<e.length;t++)e[t]!=this&&e[t].pause()"'
+			str +=
+				' onplay="this.dispatchEvent(new CustomEvent(\'vplay\',{bubbles:!0}));for(var e=document.getElementsByTagName(\'video\'),t=0;t<e.length;t++)e[t]!=this&&e[t].pause()"'
 		}
 		str += '>'
 		for (let i = 0; i < node.src.length; i++) {
@@ -852,7 +875,7 @@ Parser.prototype.popNode = function () {
 			const cells = [] // 保存新的单元格
 			const map = {}; // 被合并单元格占用的格子
 
-      (function traversal (nodes) {
+			(function traversal(nodes) {
 				for (let i = 0; i < nodes.length; i++) {
 					if (nodes[i].name === 'tr') {
 						trList.push(nodes[i])
@@ -907,7 +930,9 @@ Parser.prototype.popNode = function () {
 								style += ';justify-content: right'
 							}
 						}
-            style = (border ? `;border:${border}px ${borderstyle || 'solid'} ${bordercolor || 'gray'}` + (spacing ? '' : ';border-right:0;border-bottom:0') : '') + (padding ? `;padding:${padding}px` : '') + ';' + style
+						style = (border ? `;border:${border}px ${borderstyle || 'solid'} ${bordercolor || 'gray'}` +
+							(spacing ? '' : ';border-right:0;border-bottom:0') : '') + (padding ?
+							`;padding:${padding}px` : '') + ';' + style
 						// 处理列合并
 						if (td.attrs.colspan) {
 							style += `;grid-column-start:${col};grid-column-end:${col + parseInt(td.attrs.colspan)}`
@@ -955,12 +980,13 @@ Parser.prototype.popNode = function () {
 			}
 			if (border || padding) {
 				// 遍历
-        (function traversal (nodes) {
+				(function traversal(nodes) {
 					for (let i = 0; i < nodes.length; i++) {
 						const td = nodes[i]
 						if (td.name === 'th' || td.name === 'td') {
 							if (border) {
-                td.attrs.style = `border:${border}px ${borderstyle || 'solid'} ${bordercolor || 'gray'};${td.attrs.style || ''}`
+								td.attrs.style =
+									`border:${border}px ${borderstyle || 'solid'} ${bordercolor || 'gray'};${td.attrs.style || ''}`
 							}
 							if (padding) {
 								td.attrs.style = `padding:${padding}px;${td.attrs.style || ''}`
@@ -1011,12 +1037,13 @@ Parser.prototype.popNode = function () {
 			}
 		}
 	} else if (node.c) {
-    (function traversal (node) {
+		(function traversal(node) {
 			node.c = 2
 			for (let i = node.children.length; i--;) {
 				const child = node.children[i]
 				// #ifdef (MP-WEIXIN || MP-QQ || APP-PLUS || MP-360) && VUE3
-        if (child.name && (config.inlineTags[child.name] || ((child.attrs.style || '').includes('inline') && child.children)) && !child.c) {
+				if (child.name && (config.inlineTags[child.name] || ((child.attrs.style || '').includes(
+						'inline') && child.children)) && !child.c) {
 					traversal(child)
 				}
 				// #endif
@@ -1037,13 +1064,16 @@ Parser.prototype.popNode = function () {
 		}
 	}
 	// flex 布局时部分样式需要提取到 rich-text 外层
-  const flex = parent && ((parent.attrs.style || '').includes('flex') || (parent.attrs.style || '').includes('grid'))
+	const flex = parent && ((parent.attrs.style || '').includes('flex') || (parent.attrs.style || '').includes(
+			'grid'))
 		// #ifdef MP-WEIXIN
 		// 检查基础库版本 virtualHost 是否可用
-    && !(node.c && wx.getNFCAdapter) // eslint-disable-line
+		&&
+		!(node.c && wx.getNFCAdapter) // eslint-disable-line
 		// #endif
 		// #ifndef MP-WEIXIN || MP-QQ || MP-BAIDU || MP-TOUTIAO
-    && !node.c // eslint-disable-line
+		&&
+		!node.c // eslint-disable-line
 	// #endif
 	if (flex) {
 		node.f = ';max-width:100%'
@@ -1058,7 +1088,8 @@ Parser.prototype.popNode = function () {
 		if (styleObj[key]) {
 			const val = `;${key}:${styleObj[key].replace(' !important', '')}`
 			/* #ifndef APP-PLUS-NVUE */
-      if (flex && ((key.includes('flex') && key !== 'flex-direction') || key === 'align-self' || key.includes('grid') || styleObj[key][0] === '-' || (key.includes('width') && val.includes('%')))) {
+			if (flex && ((key.includes('flex') && key !== 'flex-direction') || key === 'align-self' || key.includes(
+					'grid') || styleObj[key][0] === '-' || (key.includes('width') && val.includes('%')))) {
 				node.f += val
 				if (key === 'width') {
 					attrs.style += ';width:100%'
@@ -1082,7 +1113,7 @@ Parser.prototype.popNode = function () {
  * @description 解析到文本
  * @param {String} text 文本内容
  */
-Parser.prototype.onText = function (text) {
+Parser.prototype.onText = function(text) {
 	if (!this.pre) {
 		// 合并空白符
 		let trim = ''
@@ -1119,7 +1150,8 @@ Parser.prototype.onText = function (text) {
 	node.text = decodeEntity(text)
 	if (this.hook(node)) {
 		// #ifdef MP-WEIXIN
-    if (this.options.selectable === 'force' && system.includes('iOS') && !uni.canIUse('rich-text.user-select')) {
+		if (this.options.selectable === 'force' && system.includes('iOS') && !uni.canIUse(
+				'rich-text.user-select')) {
 			this.expose()
 		}
 		// #endif
@@ -1132,7 +1164,7 @@ Parser.prototype.onText = function (text) {
  * @description html 词法分析器
  * @param {Object} handler 高层处理器
  */
-function Lexer (handler) {
+function Lexer(handler) {
 	this.handler = handler
 }
 
@@ -1140,7 +1172,7 @@ function Lexer (handler) {
  * @description 执行解析
  * @param {String} content 要解析的文本
  */
-Lexer.prototype.parse = function (content) {
+Lexer.prototype.parse = function(content) {
 	this.content = content || ''
 	this.i = 0 // 标记解析位置
 	this.start = 0 // 标记一个单词的开始位置
@@ -1156,7 +1188,7 @@ Lexer.prototype.parse = function (content) {
  * @returns {Boolean} 是否闭合
  * @private
  */
-Lexer.prototype.checkClose = function (method) {
+Lexer.prototype.checkClose = function(method) {
 	const selfClose = this.content[this.i] === '/'
 	if (this.content[this.i] === '>' || (selfClose && this.content[this.i + 1] === '>')) {
 		if (method) {
@@ -1184,7 +1216,7 @@ Lexer.prototype.checkClose = function (method) {
  * @description 文本状态
  * @private
  */
-Lexer.prototype.text = function () {
+Lexer.prototype.text = function() {
 	this.i = this.content.indexOf('<', this.i) // 查找最近的标签
 	if (this.i === -1) {
 		// 没有标签了
@@ -1232,7 +1264,7 @@ Lexer.prototype.text = function () {
  * @description 标签名状态
  * @private
  */
-Lexer.prototype.tagName = function () {
+Lexer.prototype.tagName = function() {
 	if (blankChar[this.content[this.i]]) {
 		// 解析到标签名
 		this.handler.onTagName(this.content.substring(this.start, this.i))
@@ -1250,7 +1282,7 @@ Lexer.prototype.tagName = function () {
  * @description 属性名状态
  * @private
  */
-Lexer.prototype.attrName = function () {
+Lexer.prototype.attrName = function() {
 	let c = this.content[this.i]
 	if (blankChar[c] || c === '=') {
 		// 解析到属性名
@@ -1285,7 +1317,7 @@ Lexer.prototype.attrName = function () {
  * @description 属性值状态
  * @private
  */
-Lexer.prototype.attrVal = function () {
+Lexer.prototype.attrVal = function() {
 	const c = this.content[this.i]
 	const len = this.content.length
 	if (c === '"' || c === "'") {
@@ -1315,7 +1347,7 @@ Lexer.prototype.attrVal = function () {
  * @returns {String} 结束的标签名
  * @private
  */
-Lexer.prototype.endTag = function () {
+Lexer.prototype.endTag = function() {
 	const c = this.content[this.i]
 	if (blankChar[c] || c === '>' || c === '/') {
 		this.handler.onCloseTag(this.content.substring(this.start, this.i))

vite.config.js

@@ -1,4 +1,6 @@
-import { loadEnv } from 'vite';
+import {
+	loadEnv
+} from 'vite';
 import uni from '@dcloudio/vite-plugin-uni';
 import path from 'path';
 // import viteCompression from 'vite-plugin-compression';