Bläddra i källkod

更新用户自充值消费分

RuHu.Xu 7 månader sedan
förälder
incheckning
279258e2da
100 ändrade filer med 329 tillägg och 51 borttagningar
  1. 12 0
      pages.json
  2. 1 0
      pages/order/confirm.vue
  3. 5 17
      pages/pay/index.vue
  4. 9 9
      pages/pay/result.vue
  5. 10 1
      pages/pay/resultYuan.vue
  6. 7 1
      pages/user/wallet/score.vue
  7. 244 0
      pages/user/wallet/topupConsumptionPoints.vue
  8. 12 1
      sheep/api/pay/wallet.js
  9. 2 2
      sheep/platform/index.js
  10. 14 7
      sheep/platform/pay.js
  11. 1 0
      unpackage/dist/build/web/assets/comment-item.111a4731.js
  12. 0 1
      unpackage/dist/build/web/assets/comment-item.c8253bd1.js
  13. 0 0
      unpackage/dist/build/web/assets/confirm-8c722113.css
  14. 1 1
      unpackage/dist/build/web/assets/const.a3af15c7.js
  15. 0 0
      unpackage/dist/build/web/assets/detail-content-card.2de46d21.js
  16. 0 0
      unpackage/dist/build/web/assets/detail-content-card.4cb3a869.js
  17. 1 0
      unpackage/dist/build/web/assets/index-5c5a85d7.css
  18. 0 0
      unpackage/dist/build/web/assets/index-8c839130.js
  19. 0 1
      unpackage/dist/build/web/assets/index-94125993.css
  20. 0 0
      unpackage/dist/build/web/assets/md5.77345265.js
  21. 0 0
      unpackage/dist/build/web/assets/mp-html.9cff5a54.js
  22. 0 0
      unpackage/dist/build/web/assets/pages-activity-bargain-detail.4504e8c8.js
  23. 0 0
      unpackage/dist/build/web/assets/pages-activity-bargain-list.e7223436.js
  24. 0 0
      unpackage/dist/build/web/assets/pages-activity-groupon-detail.ee708c75.js
  25. 0 0
      unpackage/dist/build/web/assets/pages-activity-groupon-list.daeb43c1.js
  26. 0 0
      unpackage/dist/build/web/assets/pages-activity-groupon-order.dbae14c5.js
  27. 0 0
      unpackage/dist/build/web/assets/pages-activity-groupon-order.f02840fa.js
  28. 0 0
      unpackage/dist/build/web/assets/pages-activity-index.8d30e642.js
  29. 0 0
      unpackage/dist/build/web/assets/pages-activity-seckill-list.b0e570e3.js
  30. 0 0
      unpackage/dist/build/web/assets/pages-app-sign.490c7169.js
  31. 0 0
      unpackage/dist/build/web/assets/pages-chat-index.ad84d7de.js
  32. 0 0
      unpackage/dist/build/web/assets/pages-chat-speechtotext.be16e71f.js
  33. 0 0
      unpackage/dist/build/web/assets/pages-commission-commission-ranking.725e5eee.js
  34. 0 0
      unpackage/dist/build/web/assets/pages-commission-goods.7e5dfbf3.js
  35. 0 0
      unpackage/dist/build/web/assets/pages-commission-index.c9d36981.js
  36. 0 0
      unpackage/dist/build/web/assets/pages-commission-order.18b220a8.js
  37. 0 0
      unpackage/dist/build/web/assets/pages-commission-promoter.83bc5cff.js
  38. 0 0
      unpackage/dist/build/web/assets/pages-commission-team.27a57a9f.js
  39. 0 0
      unpackage/dist/build/web/assets/pages-commission-wallet.d6f0e7b9.js
  40. 0 0
      unpackage/dist/build/web/assets/pages-commission-wallet.f600f1a6.js
  41. 0 0
      unpackage/dist/build/web/assets/pages-commission-withdraw.f762cbd0.js
  42. 0 0
      unpackage/dist/build/web/assets/pages-coupon-detail.a4c5856f.js
  43. 0 0
      unpackage/dist/build/web/assets/pages-coupon-list.d2b02b06.js
  44. 0 0
      unpackage/dist/build/web/assets/pages-goods-comment-add.62c6b8f8.js
  45. 0 0
      unpackage/dist/build/web/assets/pages-goods-comment-list.c07af2f0.js
  46. 0 0
      unpackage/dist/build/web/assets/pages-goods-groupon.666b5e33.js
  47. 0 0
      unpackage/dist/build/web/assets/pages-goods-groupon.c8f098b2.js
  48. 0 0
      unpackage/dist/build/web/assets/pages-goods-index.9fd1b56f.js
  49. 0 0
      unpackage/dist/build/web/assets/pages-goods-list.0d7bd5fc.js
  50. 0 0
      unpackage/dist/build/web/assets/pages-goods-seckill.1c013e27.js
  51. 0 0
      unpackage/dist/build/web/assets/pages-index-cart.c66a382a.js
  52. 0 0
      unpackage/dist/build/web/assets/pages-index-category.24006716.js
  53. 0 0
      unpackage/dist/build/web/assets/pages-index-index.018221f3.js
  54. 0 0
      unpackage/dist/build/web/assets/pages-index-login.b88dac65.js
  55. 1 1
      unpackage/dist/build/web/assets/pages-index-page.6f8218bc.js
  56. 1 1
      unpackage/dist/build/web/assets/pages-index-search.75aae01b.js
  57. 1 1
      unpackage/dist/build/web/assets/pages-index-user.fcbc1e50.js
  58. 0 0
      unpackage/dist/build/web/assets/pages-order-aftersale-apply.ac42ba4b.js
  59. 0 0
      unpackage/dist/build/web/assets/pages-order-aftersale-detail.b95d03a4.js
  60. 0 0
      unpackage/dist/build/web/assets/pages-order-aftersale-list.36b4044c.js
  61. 0 0
      unpackage/dist/build/web/assets/pages-order-aftersale-list.db60f6a7.js
  62. 1 1
      unpackage/dist/build/web/assets/pages-order-aftersale-log.92c8dfbf.js
  63. 0 0
      unpackage/dist/build/web/assets/pages-order-aftersale-return-delivery.640bd625.js
  64. 0 0
      unpackage/dist/build/web/assets/pages-order-confirm.364c27c6.js
  65. 0 0
      unpackage/dist/build/web/assets/pages-order-confirm.92f91569.js
  66. 0 0
      unpackage/dist/build/web/assets/pages-order-detail.b0b2d189.js
  67. 0 0
      unpackage/dist/build/web/assets/pages-order-express-log.e2f858c7.js
  68. 0 0
      unpackage/dist/build/web/assets/pages-order-list.b98509d8.js
  69. 0 0
      unpackage/dist/build/web/assets/pages-order-list.e2701567.js
  70. 0 0
      unpackage/dist/build/web/assets/pages-order-otherlist.ae5746be.js
  71. 0 0
      unpackage/dist/build/web/assets/pages-pay-index.0da3ca21.js
  72. 0 0
      unpackage/dist/build/web/assets/pages-pay-index.a0bc28cb.js
  73. 0 0
      unpackage/dist/build/web/assets/pages-pay-recharge-log.4cbdb21b.js
  74. 0 0
      unpackage/dist/build/web/assets/pages-pay-recharge-log.a39e96ff.js
  75. 0 0
      unpackage/dist/build/web/assets/pages-pay-recharge.fe4345d3.js
  76. 0 0
      unpackage/dist/build/web/assets/pages-pay-result.3ddd00b1.js
  77. 0 0
      unpackage/dist/build/web/assets/pages-pay-result.f7611e4a.js
  78. 0 0
      unpackage/dist/build/web/assets/pages-pay-resultYuan.4405a43b.js
  79. 0 0
      unpackage/dist/build/web/assets/pages-pay-resultYuan.6668ed56.js
  80. 1 1
      unpackage/dist/build/web/assets/pages-public-error.f83f7b59.js
  81. 0 1
      unpackage/dist/build/web/assets/pages-public-faq.2d9af006.js
  82. 1 0
      unpackage/dist/build/web/assets/pages-public-faq.da91eb0a.js
  83. 0 0
      unpackage/dist/build/web/assets/pages-public-merchant.dc6baeaf.js
  84. 0 0
      unpackage/dist/build/web/assets/pages-public-merchantApplyList.753f4940.js
  85. 0 0
      unpackage/dist/build/web/assets/pages-public-merchantApplyList.d9e493f2.js
  86. 1 0
      unpackage/dist/build/web/assets/pages-public-richtext.260b66c5.js
  87. 0 1
      unpackage/dist/build/web/assets/pages-public-richtext.cbb75320.js
  88. 0 0
      unpackage/dist/build/web/assets/pages-public-setting.c21f981e.js
  89. 1 1
      unpackage/dist/build/web/assets/pages-public-webview.9ea71ef4.js
  90. 0 0
      unpackage/dist/build/web/assets/pages-shop-index.e59e3c50.js
  91. 0 0
      unpackage/dist/build/web/assets/pages-user-address-edit.4f0f0d43.js
  92. 0 0
      unpackage/dist/build/web/assets/pages-user-address-list.838a4782.js
  93. 0 0
      unpackage/dist/build/web/assets/pages-user-dummyAddress-edit.2475c693.js
  94. 1 1
      unpackage/dist/build/web/assets/pages-user-dummyAddress-list.cbd9e19b.js
  95. 0 0
      unpackage/dist/build/web/assets/pages-user-goods-collect.d33b5d03.js
  96. 0 0
      unpackage/dist/build/web/assets/pages-user-goods-log.5f10bc47.js
  97. 0 0
      unpackage/dist/build/web/assets/pages-user-info.82e9ce2c.js
  98. 0 0
      unpackage/dist/build/web/assets/pages-user-invoice-edit.37ad388e.js
  99. 1 1
      unpackage/dist/build/web/assets/pages-user-invoice-list.c378298d.js
  100. 0 0
      unpackage/dist/build/web/assets/pages-user-qrcode-share.64208afa.js

+ 12 - 0
pages.json

@@ -416,6 +416,18 @@
 						"group": "用户中心"
 					}
 				},
+				{
+					"path": "wallet/topupConsumptionPoints",
+					"style": {
+						"navigationBarTitleText": "消费分充值"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "消费分充值",
+						"group": "用户中心"
+					}
+				},
 				{
 					"path": "wallet/consumptionTransfersLog",
 					"style": {

+ 1 - 0
pages/order/confirm.vue

@@ -415,6 +415,7 @@
 		// 跳转到支付页面
 		sheep.$router.redirect('/pages/pay/index', {
 			id: data.payOrderId,
+			type:1
 		});
 	}
 

+ 5 - 17
pages/pay/index.vue

@@ -128,7 +128,8 @@
 				mobile: '',
 				code: '',
 				scene: 12,
-			}
+			},
+			orderType:0
 		},
 		rules: {
 			"smsCodeUseReqDTO.code": {
@@ -146,20 +147,7 @@
 			sheep.$helper.toast('请选择支付方式');
 			return;
 		}
-
-		if (state.payment === 'wallet') {
-			uni.showModal({
-				title: '提示',
-				content: '确定要支付吗?',
-				success: function(res) {
-					if (res.confirm) {
-						sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id);
-					}
-				},
-			});
-		} else {
-			sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id);
-		}
+		sheep.$platform.pay(state.payment, state.orderType, state.orderInfo.id , state.model.type);
 	};
 	const FormRef = ref(null);
 	const onZeroPay = async () => {
@@ -171,9 +159,7 @@
 		if (!validate) {
 			return;
 		}
-
 		const { code , data } = await PayOrderApi.ZeroPurchaseSubmit(state.model);
-		
 		if (data) {
 			sheep.$router.redirect('/pages/pay/resultYuan', {
 				id: state.model.id,
@@ -278,7 +264,9 @@
 			return;
 		}
 		let id = options.id;
+		let type = options.type;
 		state.model.id = options.id;
+		state.model.type = options.type;
 
 		if (options.orderType) {
 			state.orderType = options.orderType;

+ 9 - 9
pages/pay/result.vue

@@ -25,9 +25,12 @@
           ">
 					重新支付
 				</button> -->
-				<button class="check-btn ss-reset-button" v-if="payResult === 'success'" @tap="goOrderList">
+				<button class="check-btn ss-reset-button" v-if="payResult === 'success' && !isTopUp" @tap="onOrder">
 					查看订单
 				</button>
+				<button class="check-btn ss-reset-button" v-if="payResult === 'success' && isTopUp" @tap="sheep.$router.redirect('/pages/user/wallet/score')">
+					查看钱包
+				</button>
 				<!-- TODO 非繁人:拼团接入 -->
 				<!-- <button class="check-btn ss-reset-button" v-if="payResult === 'success' && state.tradeOrder.type === 3"
 					@tap="sheep.$router.redirect('/pages/activity/groupon/order')">
@@ -76,8 +79,7 @@
 	} from '@/sheep/hooks/useModal';
 	
 	const order = ref({});
-	const result = ref({
-	});
+	const result = ref({});
 	const url = ref('https://payapp.weixin.qq.com');
 
 
@@ -127,12 +129,10 @@
 			return 'closed';
 		}
 	});
-	// watchEffect(()=>{
-	// 	if(payResult.value == 'success'){
-	// 		showWalletModal({points: state.orderInfo.jf,socialStatus: state.orderInfo.sj})
-	// 	}
-	// })
-	
+	// 是否充值消费分订单
+	const isTopUp = computed(() => {
+		return result.value.out_trade_no.includes("top-up") ;
+	});
 	// 获得订单信息
 	async function getOrderInfo(payOrderNo) {
 		state.counter++;

+ 10 - 1
pages/pay/resultYuan.vue

@@ -25,9 +25,12 @@
           ">
 					重新支付
 				</button>
-				<button class="check-btn ss-reset-button" v-if="payResult === 'success'" @tap="onOrder">
+				<button class="check-btn ss-reset-button" v-if="payResult === 'success' && !isTopUp" @tap="onOrder">
 					查看订单
 				</button>
+				<button class="check-btn ss-reset-button" v-if="payResult === 'success' && isTopUp" @tap="sheep.$router.redirect('/pages/user/wallet/score')">
+					查看钱包
+				</button>
 				<!-- TODO 非繁人:拼团接入 -->
 				<button class="check-btn ss-reset-button" v-if="payResult === 'success' && state.tradeOrder.type === 3"
 					@tap="sheep.$router.redirect('/pages/activity/groupon/order')">
@@ -170,6 +173,11 @@
 		sheep.$platform.useProvider('wechat').subscribeMessage(event);
 	}
 	// #endif
+	
+	// 是否充值消费分订单
+	const isTopUp = computed(() => {
+		return state.orderInfo.no.includes("top-up") ;
+	});
 
 	onLoad(async (options) => {
 		// console.log(options.payRes)
@@ -192,6 +200,7 @@
 			// console.log('getOrderInfo')
 			// 轮询三次检测订单支付结果
 			await getOrderInfo(state.id);
+
 		}
 		
 		

+ 7 - 1
pages/user/wallet/score.vue

@@ -27,11 +27,17 @@
 					<view class="ss-m-b-10  circle value-box ss-flex ss-row-center" style="background:#0c912f">
 						<view>消费分</view>
 					</view>
-					<view class="ss-m-b-30 ss-font-40" :style="{color:percentageColor}">
+					<view class="ss-m-b-30 ss-font-40" >
 						<text class="all-title ss-m-r-8">{{ points2point(userWallet.integralDO.consumptionPoints) }}</text>
 					</view>
 					<view class="ss-flex">
 						<view class="all-title ss-m-x-8">
+							<button class="btn ss-reset-button" @tap="sheep.$router.go('/pages/user/wallet/topupConsumptionPoints')">
+								充值
+							</button>
+						</view>
+						<view class="all-title ss-m-x-8">
+							
 							<button class="btn ss-reset-button" @tap="sheep.$router.go('/pages/user/wallet/consumptionTransfers')">
 								消费分转让
 							</button>

+ 244 - 0
pages/user/wallet/topupConsumptionPoints.vue

@@ -0,0 +1,244 @@
+<!-- 消费分充值 -->
+<template>
+	<s-layout title="消费分充值">
+		<view class="bg-white ss-modal-box ss-flex-col">
+			
+			<!-- 提现金额 -->
+			<view class="modal-content ss-m-t-30">
+				<uni-forms :model="state.model" :rules="state.rules" validateTrigger="bind" labelPosition="left" border
+					class="form-box" labelWidth='200' ref="FormRef">
+					<view class="bg-white ss-p-x-30">
+						<uni-forms-item name="quota" label="充值金额" :required="true">
+							<uni-easyinput v-model="state.payPrice" type="number"
+								placeholder="请输入金额" :inputBorder="false" :clearable="false" @input="validateInput" :maxlength="9" />
+						</uni-forms-item>
+						<uni-forms-item name="quota" label="实到消费分">
+							<view class="ss-flex ss-h-100">
+								{{consumption}}
+							</view>
+						</uni-forms-item>
+
+					</view>
+				</uni-forms>
+				<view class="ss-flex ss-row-center ss-col-center ss-m-t-30 text-red text-center">备注:充值后请及时查看钱包,查收消费分是否到账</view> 
+			</view>
+			<view class="modal-footer ss-flex ss-row-center ss-col-center ss-m-t-80 ss-m-b-40 ss-flex-5">
+				<button class="ss-reset-button save-btn" @tap="submit" >
+					确定
+				</button>
+			</view>
+		</view>
+	</s-layout>
+</template>
+<script setup>
+	import {
+		computed,
+		reactive,
+		watchEffect,
+		nextTick, 
+		onUnmounted
+	} from 'vue';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import { clone } from 'lodash';
+	import {
+		fen2yuan,
+		points2point
+	} from '@/sheep/hooks/useGoods';
+	import md5 from 'blueimp-md5';
+	import PayWalletApi from '@/sheep/api/pay/wallet';
+	import WithdrawalApi from '@/sheep/api/distri/withdrawal';
+	import { showAuthModal, showShareModal } from '@/sheep/hooks/useModal';
+	const userWallet = computed(() => sheep.$store('user').userWallet);
+	const userInfo = computed(() => sheep.$store('user').userInfo);
+
+	const state = reactive({
+		model: {},
+		payPrice:undefined,
+		percentage:{
+			consumptionMagnification:0,
+			userTopUpConsumptionPoints:0
+		}
+	});
+
+	const consumption = computed(() => {
+		if(!state.payPrice){
+			return 0;
+		}
+		let result = parseFloat(state.percentage.consumptionMagnification) * state.payPrice;
+		// 地板除到小数点后两位
+		result = Math.floor(result * 100) / 100;
+		return result;
+	});
+	
+	// 确保输入是整数
+	async function validateInput(value) {
+		const intValue = parseInt(value);
+		const strPoints = value.toString()
+		const [integerPart, decimalPart] = strPoints.split('.')
+		if (decimalPart) {
+			nextTick(() => {
+				state.payPrice = integerPart;
+			});
+		}
+	}
+	
+	const submit = async () => {
+		if (!state.payPrice) {
+			sheep.$helper.toast('请输入充值金额');
+			return;
+		}
+		if (parseFloat(state.payPrice) < state.percentage.userTopUpConsumptionPoints) {
+			sheep.$helper.toast(`充值金额不能少于${state.percentage.userTopUpConsumptionPoints}`);
+			return;
+		}
+		let {
+			code,
+			data
+		} = await PayWalletApi.topupConsumptionPointsCreate({
+			payPrice:state.payPrice,
+			topUpConsumptionPoints:state.payPrice,
+			userName:userInfo.value.username,
+		});
+		if(code === 0){
+			sheep.$router.redirect('/pages/pay/index', {
+				id: data.payOrderId,
+				type:2
+			});
+		}
+	};
+	
+	const getpercentage = async () => {
+		const {code,data} = await WithdrawalApi.getWithdrawalPercentage();
+		if(code === 0){
+			state.percentage = data;
+		}
+	}
+
+	onLoad(async(options) => {
+		await getpercentage();
+	});
+</script>
+
+<style lang="scss" scoped>
+	.all-btn{
+		height: 60rpx;
+		line-height: 60rpx;
+		min-width: 80rpx;
+		padding: 0 30rpx;
+		border-radius: 30rpx;
+		font-size: 26rpx;
+		margin-right: 10rpx;
+		border: 2rpx solid var(--ui-BG-Main);
+		color: var(--ui-BG-Main);
+	}
+	.out-icon {
+		width: 36rpx;
+		height: 36rpx;
+		margin-right: 26rpx;
+	}
+	
+	.ss-modal-box {
+		height: calc(100vh - 88rpx);
+		// max-height: 1000rpx;
+		.input-money {
+			width:90% ;
+			padding:0 10rpx;
+			// text-indent: 20rpx;
+			height: 80rpx;
+			border: 1px solid #bbbbbb;
+			border-radius: 10rpx;
+			margin: 15rpx auto;
+			font-size: 28rpx;
+			input{
+				width: 100%;
+				height: 100%;
+				font-size: 28rpx;
+			}
+		}
+		.modal-header {
+			position: relative;
+			padding: 60rpx 20rpx 40rpx;
+
+
+			.money-text {
+				color: $red;
+				font-size: 46rpx;
+				font-weight: bold;
+				font-family: OPPOSANS;
+
+				&::before {
+					content: '¥';
+					font-size: 30rpx;
+				}
+			}
+
+			.time-text {
+				font-size: 26rpx;
+				color: $gray-b;
+			}
+
+			.close-icon {
+				position: absolute;
+				top: 10rpx;
+				right: 20rpx;
+				font-size: 46rpx;
+				opacity: 0.2;
+			}
+		}
+
+		.modal-content {
+			overflow-y: auto;
+
+			.out-title {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #333333;
+			}
+
+			.out-tip {
+				font-size: 26rpx;
+				color: #bbbbbb;
+			}
+
+			.out-item {
+				height: 86rpx;
+			}
+
+			.disabled-out-item {
+				.out-title {
+					color: #999999;
+				}
+			}
+
+			.userInfo-money {
+				font-size: 26rpx;
+				color: #bbbbbb;
+				line-height: normal;
+			}
+		}
+
+		.save-btn {
+			width: 710rpx;
+			height: 80rpx;
+			border-radius: 40rpx;
+			background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+			color: $white;
+		}
+
+		.disabled-btn {
+			background: #e5e5e5;
+			color: #999999;
+		}
+
+		.past-due-btn {
+			width: 710rpx;
+			height: 80rpx;
+			border-radius: 40rpx;
+			background-color: #999;
+			color: #fff;
+		}
+	}
+</style>

+ 12 - 1
sheep/api/pay/wallet.js

@@ -62,7 +62,18 @@ const PayWalletApi = {
       data,
     });
   },
-  
+  // 消费分充值
+  topupConsumptionPointsCreate: (data) => {
+    return request({
+      url: '/distri/user-top-up-consumption-points-order/create',
+      method: 'POST',
+      data,
+	  custom: {
+	    showError: true,
+	    showLoading: true,
+	  },
+    });
+  },
   // 获得钱包充值记录分页
   getWalletRechargePage: (params) => {
     return request({

+ 2 - 2
sheep/platform/index.js

@@ -75,8 +75,8 @@ const useProvider = (_provider = '') => {
 };
 
 // 支付服务转发
-const pay = (payment, orderType, orderSN) => {
-  return new Pay(payment, orderType, orderSN);
+const pay = (payment, orderType, orderSN, orderType2) => {
+  return new Pay(payment, orderType, orderSN, orderType2);
 };
 
 /**

+ 14 - 7
sheep/platform/pay.js

@@ -13,23 +13,29 @@ import PayOrderApi from '@/sheep/api/pay/order';
  * @param {String} payment = ['wechat','alipay','wallet','mock']  	- 支付方式
  * @param {String} orderType = ['goods','recharge','groupon']  	- 订单类型
  * @param {String} id					- 订单号
+ * @param {String} orderType2 = ['1','2']  	- 中星订单类型,1商品 2消费分充值	
  */
 
 export default class SheepPay {
-	constructor(payment, orderType, id) {
+	constructor(payment, orderType, id, orderType2) {
+		console.log(orderType2)
 		this.payment = payment;
 		this.id = id;
 		this.orderType = orderType;
+		this.orderType2 = orderType2;
 		this.payAction();
+		
 	}
 
 	payAction() {
 		const payAction = {
+			
 			WechatOfficialAccount: {
 				wechat: () => {
 					this.wechatOfficialAccountPay();
 				},
 				JSAPI:() => {
+					
 					this.fuYouWechatOfficialAccountPay();
 				},
 				alipay: () => {
@@ -114,7 +120,8 @@ export default class SheepPay {
 			let data = {
 				id: this.id,
 				channelCode: channel,
-				channelExtras: {}
+				channelExtras: {},
+				orderType:this.orderType2
 			};
 			// 特殊逻辑:微信公众号、小程序支付时,必须传入 openid
 			if (['wx_pub', 'wx_lite'].includes(channel)) {
@@ -150,6 +157,7 @@ export default class SheepPay {
 			let data = {
 				id: this.id,
 				channelCode:channel,
+				orderType:this.orderType2,
 				req: {
 					trade_type: channel,
 				}
@@ -184,7 +192,7 @@ export default class SheepPay {
 	}
 	// #ifdef H5
 	// 富友微信公众号 JSSDK 支付
-	async fuYouWechatOfficialAccountPay() {
+	async fuYouWechatOfficialAccountPay(orderType2) {
 		// console.log("富友微信公众号 JSSDK 支付");
 		let {
 			code,
@@ -197,7 +205,7 @@ export default class SheepPay {
 
 		let newJsonString = data.replace(/"sdk_package":/g, '"packageValue":');
 		const payConfig = JSON.parse(newJsonString);
-		console.log('payConfig',payConfig);
+		// console.log('payConfig',payConfig);
 		// return;
 		
 		$wxsdk.wxpay(payConfig, {
@@ -218,9 +226,8 @@ export default class SheepPay {
 		});
 	}
 	// 微信公众号 JSSDK 支付
-	async wechatOfficialAccountPay() {
-		// this.payResult('fail');
-		console.log("原微信公众号 JSSDK 支付")
+	async wechatOfficialAccountPay(orderType2) {
+		console.log(this.orderType2,"123123123")
 		let {
 			code,
 			data

+ 1 - 0
unpackage/dist/build/web/assets/comment-item.111a4731.js

@@ -0,0 +1 @@
+import{m as s,n as e,f as l,g as a,w as t,k as r,u as c,v as i,l as m,F as u,r as n,i as o,y as d,j as p,D as f}from"./index-8c839130.js";import{_}from"./uni-rate.db4b2667.js";import{_ as y}from"./su-image.fa081ad5.js";import{_ as v}from"./_plugin-vue_export-helper.1b428a4d.js";const x=v({__name:"comment-item",props:{item:{type:Object,default(){}}},setup:v=>(x,g)=>{const h=d,j=p,k=s(e("uni-rate"),_),w=s(e("su-image"),y),b=f;return l(),a(j,null,{default:t((()=>{var s;return[r(j,{class:"user ss-flex ss-m-b-14"},{default:t((()=>[r(j,{class:"ss-m-r-20 ss-flex"},{default:t((()=>[r(h,{class:"avatar",src:v.item.userAvatar},null,8,["src"])])),_:1}),r(j,{class:"nickname ss-m-r-20"},{default:t((()=>[c(i(v.item.userNickname),1)])),_:1}),r(j,{class:""},{default:t((()=>[r(k,{readonly:!0,modelValue:v.item.scores,"onUpdate:modelValue":g[0]||(g[0]=s=>v.item.scores=s),size:"18"},null,8,["modelValue"])])),_:1})])),_:1}),r(j,{class:"content"},{default:t((()=>[c(i(v.item.content),1)])),_:1}),(null==(s=v.item.picUrls)?void 0:s.length)?(l(),a(j,{key:0,class:"ss-m-t-24"},{default:t((()=>[r(b,{class:"scroll-box","scroll-x":"","scroll-anchoring":""},{default:t((()=>[r(j,{class:"ss-flex"},{default:t((()=>[(l(!0),m(u,null,n(v.item.picUrls,((s,e)=>(l(),a(j,{key:s,class:"ss-m-r-10"},{default:t((()=>[r(w,{class:"content-img",isPreview:"",previewList:v.item.picUrls,current:e,src:s,height:120,width:120,mode:"aspectFill"},null,8,["previewList","current","src"])])),_:2},1024)))),128))])),_:1})])),_:1})])),_:1})):o("",!0),v.item.replyTime?(l(),a(j,{key:1,class:"ss-m-t-20 reply-box"},{default:t((()=>[r(j,{class:"reply-title"},{default:t((()=>[c("商家回复:")])),_:1}),r(j,{class:"reply-content"},{default:t((()=>[c(i(v.item.replyContent),1)])),_:1})])),_:1})):o("",!0)]})),_:1})}},[["__scopeId","data-v-c011c544"]]);export{x as c};

+ 0 - 1
unpackage/dist/build/web/assets/comment-item.c8253bd1.js

@@ -1 +0,0 @@
-import{m as s,n as e,f as l,g as a,w as t,k as r,u as c,v as i,l as m,F as n,r as u,i as o,y as d,j as p,D as f}from"./index-b9093c96.js";import{_}from"./uni-rate.b06b4713.js";import{_ as y}from"./su-image.d8c1c295.js";import{_ as v}from"./_plugin-vue_export-helper.1b428a4d.js";const x=v({__name:"comment-item",props:{item:{type:Object,default(){}}},setup:v=>(x,g)=>{const k=d,h=p,j=s(e("uni-rate"),_),w=s(e("su-image"),y),b=f;return l(),a(h,null,{default:t((()=>{var s;return[r(h,{class:"user ss-flex ss-m-b-14"},{default:t((()=>[r(h,{class:"ss-m-r-20 ss-flex"},{default:t((()=>[r(k,{class:"avatar",src:v.item.userAvatar},null,8,["src"])])),_:1}),r(h,{class:"nickname ss-m-r-20"},{default:t((()=>[c(i(v.item.userNickname),1)])),_:1}),r(h,{class:""},{default:t((()=>[r(j,{readonly:!0,modelValue:v.item.scores,"onUpdate:modelValue":g[0]||(g[0]=s=>v.item.scores=s),size:"18"},null,8,["modelValue"])])),_:1})])),_:1}),r(h,{class:"content"},{default:t((()=>[c(i(v.item.content),1)])),_:1}),(null==(s=v.item.picUrls)?void 0:s.length)?(l(),a(h,{key:0,class:"ss-m-t-24"},{default:t((()=>[r(b,{class:"scroll-box","scroll-x":"","scroll-anchoring":""},{default:t((()=>[r(h,{class:"ss-flex"},{default:t((()=>[(l(!0),m(n,null,u(v.item.picUrls,((s,e)=>(l(),a(h,{key:s,class:"ss-m-r-10"},{default:t((()=>[r(w,{class:"content-img",isPreview:"",previewList:v.item.picUrls,current:e,src:s,height:120,width:120,mode:"aspectFill"},null,8,["previewList","current","src"])])),_:2},1024)))),128))])),_:1})])),_:1})])),_:1})):o("",!0),v.item.replyTime?(l(),a(h,{key:1,class:"ss-m-t-20 reply-box"},{default:t((()=>[r(h,{class:"reply-title"},{default:t((()=>[c("商家回复:")])),_:1}),r(h,{class:"reply-content"},{default:t((()=>[c(i(v.item.replyContent),1)])),_:1})])),_:1})):o("",!0)]})),_:1})}},[["__scopeId","data-v-c011c544"]]);export{x as c};

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/confirm-8c722113.css


+ 1 - 1
unpackage/dist/build/web/assets/const.900bac4b.js → unpackage/dist/build/web/assets/const.a3af15c7.js

@@ -1 +1 @@
-import{bh as e}from"./index-b9093c96.js";const T={PRICE:{type:1,name:"满减"},PERCENT:{type:2,name:"折扣"}},s={DATE:{type:1,name:"固定日期可用"},TERM:{type:2,name:"领取之后可用"}},t={WAIT_START:"即将开始",STARTED:"进行中",END:"已结束"},a=(T,s)=>{const a=e();return a.isBefore(T)?t.WAIT_START:a.isAfter(s)?t.END:t.STARTED};export{s as C,T as P,t as T,a as g};
+import{bh as e}from"./index-8c839130.js";const T={PRICE:{type:1,name:"满减"},PERCENT:{type:2,name:"折扣"}},s={DATE:{type:1,name:"固定日期可用"},TERM:{type:2,name:"领取之后可用"}},t={WAIT_START:"即将开始",STARTED:"进行中",END:"已结束"},a=(T,s)=>{const a=e();return a.isBefore(T)?t.WAIT_START:a.isAfter(s)?t.END:t.STARTED};export{s as C,T as P,t as T,a as g};

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/detail-content-card.2de46d21.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/detail-content-card.4cb3a869.js


+ 1 - 0
unpackage/dist/build/web/assets/index-5c5a85d7.css

@@ -0,0 +1 @@
+.code-btn-start[data-v-87caef2e]{width:4.9375rem;height:1.75rem;line-height:normal;background:linear-gradient(90deg,var(--ui-BG-Main),var(--ui-BG-Main-gradient));border-radius:.875rem;font-size:.8125rem;font-weight:500;color:#fff}[data-v-87caef2e] .is-disabled{color:#333}.pay-icon[data-v-87caef2e]{width:1.125rem;height:1.125rem;margin-right:.8125rem}.ss-modal-box .modal-header[data-v-87caef2e]{position:relative;padding:1.875rem .625rem 1.25rem}.ss-modal-box .modal-header .money-text[data-v-87caef2e]{color:#ff3000;font-size:1.4375rem;font-weight:700;font-family:OPPOSANS}.ss-modal-box .modal-header .money-text[data-v-87caef2e]:before{content:"¥";font-size:.9375rem}.ss-modal-box .modal-header .time-text[data-v-87caef2e]{font-size:.8125rem;color:#bbb}.ss-modal-box .modal-header .close-icon[data-v-87caef2e]{position:absolute;top:.3125rem;right:.625rem;font-size:1.4375rem;opacity:.2}.ss-modal-box .modal-content[data-v-87caef2e]{overflow-y:auto}.ss-modal-box .modal-content .pay-title[data-v-87caef2e]{font-size:.8125rem;font-weight:500;color:#333}.ss-modal-box .modal-content .pay-tip[data-v-87caef2e]{font-size:.8125rem;color:#bbb}.ss-modal-box .modal-content .pay-item[data-v-87caef2e]{height:2.6875rem}.ss-modal-box .modal-content .disabled-pay-item .pay-title[data-v-87caef2e]{color:#999}.ss-modal-box .modal-content .userInfo-money[data-v-87caef2e]{font-size:.8125rem;color:#bbb;line-height:normal}.ss-modal-box .save-btn[data-v-87caef2e]{width:22.1875rem;height:2.5rem;border-radius:1.25rem;background:linear-gradient(90deg,var(--ui-BG-Main),var(--ui-BG-Main-gradient));color:#fff}.ss-modal-box .disabled-btn[data-v-87caef2e]{background:#e5e5e5;color:#999}.ss-modal-box .past-due-btn[data-v-87caef2e]{width:22.1875rem;height:2.5rem;border-radius:1.25rem;background-color:#999;color:#fff}

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/index-8c839130.js


+ 0 - 1
unpackage/dist/build/web/assets/index-94125993.css

@@ -1 +0,0 @@
-.code-btn-start[data-v-4d36441d]{width:4.9375rem;height:1.75rem;line-height:normal;background:linear-gradient(90deg,var(--ui-BG-Main),var(--ui-BG-Main-gradient));border-radius:.875rem;font-size:.8125rem;font-weight:500;color:#fff}[data-v-4d36441d] .is-disabled{color:#333}.pay-icon[data-v-4d36441d]{width:1.125rem;height:1.125rem;margin-right:.8125rem}.ss-modal-box .modal-header[data-v-4d36441d]{position:relative;padding:1.875rem .625rem 1.25rem}.ss-modal-box .modal-header .money-text[data-v-4d36441d]{color:#ff3000;font-size:1.4375rem;font-weight:700;font-family:OPPOSANS}.ss-modal-box .modal-header .money-text[data-v-4d36441d]:before{content:"¥";font-size:.9375rem}.ss-modal-box .modal-header .time-text[data-v-4d36441d]{font-size:.8125rem;color:#bbb}.ss-modal-box .modal-header .close-icon[data-v-4d36441d]{position:absolute;top:.3125rem;right:.625rem;font-size:1.4375rem;opacity:.2}.ss-modal-box .modal-content[data-v-4d36441d]{overflow-y:auto}.ss-modal-box .modal-content .pay-title[data-v-4d36441d]{font-size:.8125rem;font-weight:500;color:#333}.ss-modal-box .modal-content .pay-tip[data-v-4d36441d]{font-size:.8125rem;color:#bbb}.ss-modal-box .modal-content .pay-item[data-v-4d36441d]{height:2.6875rem}.ss-modal-box .modal-content .disabled-pay-item .pay-title[data-v-4d36441d]{color:#999}.ss-modal-box .modal-content .userInfo-money[data-v-4d36441d]{font-size:.8125rem;color:#bbb;line-height:normal}.ss-modal-box .save-btn[data-v-4d36441d]{width:22.1875rem;height:2.5rem;border-radius:1.25rem;background:linear-gradient(90deg,var(--ui-BG-Main),var(--ui-BG-Main-gradient));color:#fff}.ss-modal-box .disabled-btn[data-v-4d36441d]{background:#e5e5e5;color:#999}.ss-modal-box .past-due-btn[data-v-4d36441d]{width:22.1875rem;height:2.5rem;border-radius:1.25rem;background-color:#999;color:#fff}

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/md5.77345265.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/mp-html.9cff5a54.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-bargain-detail.4504e8c8.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-bargain-list.e7223436.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-groupon-detail.ee708c75.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-groupon-list.daeb43c1.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-groupon-order.dbae14c5.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-groupon-order.f02840fa.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-index.8d30e642.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-activity-seckill-list.b0e570e3.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-app-sign.490c7169.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-chat-index.ad84d7de.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-chat-speechtotext.be16e71f.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-commission-ranking.725e5eee.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-goods.7e5dfbf3.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-index.c9d36981.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-order.18b220a8.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-promoter.83bc5cff.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-team.27a57a9f.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-wallet.d6f0e7b9.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-wallet.f600f1a6.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-commission-withdraw.f762cbd0.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-coupon-detail.a4c5856f.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-coupon-list.d2b02b06.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-comment-add.62c6b8f8.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-comment-list.c07af2f0.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-groupon.666b5e33.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-groupon.c8f098b2.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-index.9fd1b56f.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-list.0d7bd5fc.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-goods-seckill.1c013e27.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-index-cart.c66a382a.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-index-category.24006716.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-index-index.018221f3.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-index-login.b88dac65.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-index-page.c9bc81cb.js → unpackage/dist/build/web/assets/pages-index-page.6f8218bc.js

@@ -1 +1 @@
-import{_ as t,a as e}from"./s-block.d77875f8.js";import{z as s,o,Y as a,e as p,f as n,g as i,w as r,m as l,l as m,r as u,F as _,n as y,k as d}from"./index-b9093c96.js";import{_ as g}from"./s-layout.f3d19b34.js";import"./phone-international-input.393e85de.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.0820b69a.js";import"./uni-badge.ce2bb39d.js";import"./su-image.d8c1c295.js";import"./su-swiper.12ef97ac.js";import"./s-goods-column.f5d4cbad.js";import"./points.c381a8e1.js";import"./useGoods.4e351a76.js";/* empty css                                                                     */import"./uni-load-more.2480d6c8.js";/* empty css                                                                *//* empty css                                                                      */import"./const.900bac4b.js";import"./mp-html.91076c61.js";import"./pages-public-richtext.cbb75320.js";const c={__name:"page",setup(c){const j=s({name:"",components:[],navigationBar:{},page:{}});return o((async t=>{var e,s,o;let p=t.id;const{code:n,data:i}=await a.getDiyPage(p);0===n&&(j.name=i.name,j.components=null==(e=i.property)?void 0:e.components,j.navigationBar=null==(s=i.property)?void 0:s.navigationBar,j.page=null==(o=i.property)?void 0:o.page)})),p((()=>{})),(s,o)=>{const a=l(y("s-block-item"),t),p=l(y("s-block"),e),c=l(y("s-layout"),g);return n(),i(c,{title:j.name,navbar:"custom",bgStyle:j.page,navbarStyle:j.navigationBar,onShareAppMessage:"",showLeftButton:""},{default:r((()=>[(n(!0),m(_,null,u(j.components,((t,e)=>(n(),i(p,{key:e,styles:t.property.style},{default:r((()=>[d(a,{type:t.id,data:t.property,styles:t.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["title","bgStyle","navbarStyle"])}}};export{c as default};
+import{_ as t,a as e}from"./s-block.7db3ba12.js";import{z as s,o,Y as a,e as p,f as n,g as i,w as r,m as l,l as m,r as u,F as _,n as y,k as d}from"./index-8c839130.js";import{_ as g}from"./s-layout.8d369813.js";import"./phone-international-input.a60c1c3d.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.cf4ebbdc.js";import"./uni-badge.f0bdbba1.js";import"./su-image.fa081ad5.js";import"./su-swiper.db66325a.js";import"./s-goods-column.1ea63629.js";import"./points.c381a8e1.js";import"./useGoods.77887027.js";/* empty css                                                                     */import"./uni-load-more.f34f2326.js";/* empty css                                                                *//* empty css                                                                      */import"./const.a3af15c7.js";import"./mp-html.9cff5a54.js";import"./pages-public-richtext.260b66c5.js";const c={__name:"page",setup(c){const j=s({name:"",components:[],navigationBar:{},page:{}});return o((async t=>{var e,s,o;let p=t.id;const{code:n,data:i}=await a.getDiyPage(p);0===n&&(j.name=i.name,j.components=null==(e=i.property)?void 0:e.components,j.navigationBar=null==(s=i.property)?void 0:s.navigationBar,j.page=null==(o=i.property)?void 0:o.page)})),p((()=>{})),(s,o)=>{const a=l(y("s-block-item"),t),p=l(y("s-block"),e),c=l(y("s-layout"),g);return n(),i(c,{title:j.name,navbar:"custom",bgStyle:j.page,navbarStyle:j.navigationBar,onShareAppMessage:"",showLeftButton:""},{default:r((()=>[(n(!0),m(_,null,u(j.components,((t,e)=>(n(),i(p,{key:e,styles:t.property.style},{default:r((()=>[d(a,{type:t.id,data:t.property,styles:t.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["title","bgStyle","navbarStyle"])}}};export{c as default};

+ 1 - 1
unpackage/dist/build/web/assets/pages-index-search.7c507ba5.js → unpackage/dist/build/web/assets/pages-index-search.75aae01b.js

@@ -1 +1 @@
-import{z as s,o as t,Q as e,f as o,g as a,w as r,m as i,k as l,u as n,l as c,r as u,F as f,s as h,q as y,P as d,X as p,n as _,j as m,J as x,v as L}from"./index-b9093c96.js";import{b as g,_ as b}from"./s-layout.f3d19b34.js";import{_ as j}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.393e85de.js";import"./useGoods.4e351a76.js";const k=j({__name:"search",setup(j){const k=s({historyList:[]});function w(s){s&&(!function(s){k.historyList.includes(s)&&k.historyList.splice(k.historyList.indexOf(s),1);k.historyList.unshift(s),k.historyList.length>=10&&(k.historyList.length=10);y("searchHistory",k.historyList)}(s),h.$router.go("/pages/goods/list",{keyword:s}))}function v(){d({title:"提示",content:"确认清除搜索历史吗?",success:function(s){s.confirm&&(k.historyTag=[],p("searchHistory"))}})}return t((()=>{k.historyList=e("searchHistory")||[]})),(s,t)=>{const e=i(_("uni-search-bar"),g),h=m,y=x,d=i(_("s-layout"),b);return o(),a(d,{class:"set-wrap",title:"搜索",bgStyle:{color:"#FFF"}},{default:r((()=>[l(h,{class:"ss-p-x-24"},{default:r((()=>[l(h,{class:"ss-flex ss-col-center"},{default:r((()=>[l(e,{class:"ss-flex-1",radius:"33",placeholder:"请输入关键字",cancelButton:"none",focus:!0,onConfirm:t[0]||(t[0]=s=>w(s.value))})])),_:1}),l(h,{class:"ss-flex ss-row-between ss-col-center"},{default:r((()=>[l(h,{class:"serach-history"},{default:r((()=>[n("搜索历史")])),_:1}),l(y,{class:"clean-history ss-reset-button",onClick:v},{default:r((()=>[n(" 清除搜索历史 ")])),_:1})])),_:1}),l(h,{class:"ss-flex ss-col-center ss-row-left ss-flex-wrap"},{default:r((()=>[(o(!0),c(f,null,u(k.historyList,((s,t)=>(o(),a(y,{class:"history-btn ss-reset-button",onClick:t=>w(s),key:t},{default:r((()=>[n(L(s),1)])),_:2},1032,["onClick"])))),128))])),_:1})])),_:1})])),_:1})}}},[["__scopeId","data-v-d3779116"]]);export{k as default};
+import{z as s,o as t,Q as e,f as o,g as a,w as r,m as i,k as l,u as n,l as c,r as u,F as f,s as h,q as y,P as d,X as p,n as _,j as m,J as x,v as L}from"./index-8c839130.js";import{b as g,_ as b}from"./s-layout.8d369813.js";import{_ as j}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.a60c1c3d.js";import"./useGoods.77887027.js";const k=j({__name:"search",setup(j){const k=s({historyList:[]});function w(s){s&&(!function(s){k.historyList.includes(s)&&k.historyList.splice(k.historyList.indexOf(s),1);k.historyList.unshift(s),k.historyList.length>=10&&(k.historyList.length=10);y("searchHistory",k.historyList)}(s),h.$router.go("/pages/goods/list",{keyword:s}))}function v(){d({title:"提示",content:"确认清除搜索历史吗?",success:function(s){s.confirm&&(k.historyTag=[],p("searchHistory"))}})}return t((()=>{k.historyList=e("searchHistory")||[]})),(s,t)=>{const e=i(_("uni-search-bar"),g),h=m,y=x,d=i(_("s-layout"),b);return o(),a(d,{class:"set-wrap",title:"搜索",bgStyle:{color:"#FFF"}},{default:r((()=>[l(h,{class:"ss-p-x-24"},{default:r((()=>[l(h,{class:"ss-flex ss-col-center"},{default:r((()=>[l(e,{class:"ss-flex-1",radius:"33",placeholder:"请输入关键字",cancelButton:"none",focus:!0,onConfirm:t[0]||(t[0]=s=>w(s.value))})])),_:1}),l(h,{class:"ss-flex ss-row-between ss-col-center"},{default:r((()=>[l(h,{class:"serach-history"},{default:r((()=>[n("搜索历史")])),_:1}),l(y,{class:"clean-history ss-reset-button",onClick:v},{default:r((()=>[n(" 清除搜索历史 ")])),_:1})])),_:1}),l(h,{class:"ss-flex ss-col-center ss-row-left ss-flex-wrap"},{default:r((()=>[(o(!0),c(f,null,u(k.historyList,((s,t)=>(o(),a(y,{class:"history-btn ss-reset-button",onClick:t=>w(s),key:t},{default:r((()=>[n(L(s),1)])),_:2},1032,["onClick"])))),128))])),_:1})])),_:1})])),_:1})}}},[["__scopeId","data-v-d3779116"]]);export{k as default};

+ 1 - 1
unpackage/dist/build/web/assets/pages-index-user.7292dfa2.js → unpackage/dist/build/web/assets/pages-index-user.fcbc1e50.js

@@ -1 +1 @@
-import{h as s,c as e,p as t,s as a,b as o,d as r,e as p,o as i,q as l,t as n,f as u,g as m,w as _,m as d,l as y,r as c,F as j,n as g,k as b}from"./index-b9093c96.js";import{_ as v,a as f}from"./s-block.d77875f8.js";import{_ as k}from"./s-layout.f3d19b34.js";import"./phone-international-input.393e85de.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.0820b69a.js";import"./uni-badge.ce2bb39d.js";import"./su-image.d8c1c295.js";import"./su-swiper.12ef97ac.js";import"./s-goods-column.f5d4cbad.js";import"./points.c381a8e1.js";import"./useGoods.4e351a76.js";/* empty css                                                                     */import"./uni-load-more.2480d6c8.js";/* empty css                                                                *//* empty css                                                                      */import"./const.900bac4b.js";import"./mp-html.91076c61.js";import"./pages-public-richtext.cbb75320.js";const x={__name:"user",setup(x){s();const h=e((()=>a.$store("app").template.user)),S=e((()=>a.$store("user").isLogin));return t((()=>{a.$store("user").updateUserData()})),o((()=>{a.$store("user").updateUserData(),setTimeout((function(){r()}),800)})),p((()=>{})),i((s=>{s.linkId&&(l("linkId",s.linkId),S.value||n("register","register"))})),(s,e)=>{var t;const a=d(g("s-block-item"),v),o=d(g("s-block"),f),r=d(g("s-layout"),k);return u(),m(r,{title:"我的",tabbar:"/pages/index/user",navbar:"custom",bgStyle:h.value.page,navbarStyle:null==(t=h.value.style)?void 0:t.navbar,onShareAppMessage:""},{default:_((()=>[(u(!0),y(j,null,c(h.value.components,((s,e)=>(u(),m(o,{key:e,styles:s.property.style},{default:_((()=>[b(a,{type:s.id,data:s.property,styles:s.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["bgStyle","navbarStyle"])}}};export{x as default};
+import{h as s,c as e,p as t,s as a,b as o,d as r,e as p,o as i,q as l,t as n,f as u,g as m,w as _,m as d,l as y,r as c,F as j,n as g,k as b}from"./index-8c839130.js";import{_ as v,a as f}from"./s-block.7db3ba12.js";import{_ as k}from"./s-layout.8d369813.js";import"./phone-international-input.a60c1c3d.js";import"./_plugin-vue_export-helper.1b428a4d.js";import"./uni-list.cf4ebbdc.js";import"./uni-badge.f0bdbba1.js";import"./su-image.fa081ad5.js";import"./su-swiper.db66325a.js";import"./s-goods-column.1ea63629.js";import"./points.c381a8e1.js";import"./useGoods.77887027.js";/* empty css                                                                     */import"./uni-load-more.f34f2326.js";/* empty css                                                                *//* empty css                                                                      */import"./const.a3af15c7.js";import"./mp-html.9cff5a54.js";import"./pages-public-richtext.260b66c5.js";const x={__name:"user",setup(x){s();const h=e((()=>a.$store("app").template.user)),S=e((()=>a.$store("user").isLogin));return t((()=>{a.$store("user").updateUserData()})),o((()=>{a.$store("user").updateUserData(),setTimeout((function(){r()}),800)})),p((()=>{})),i((s=>{s.linkId&&(l("linkId",s.linkId),S.value||n("register","register"))})),(s,e)=>{var t;const a=d(g("s-block-item"),v),o=d(g("s-block"),f),r=d(g("s-layout"),k);return u(),m(r,{title:"我的",tabbar:"/pages/index/user",navbar:"custom",bgStyle:h.value.page,navbarStyle:null==(t=h.value.style)?void 0:t.navbar,onShareAppMessage:""},{default:_((()=>[(u(!0),y(j,null,c(h.value.components,((s,e)=>(u(),m(o,{key:e,styles:s.property.style},{default:_((()=>[b(a,{type:s.id,data:s.property,styles:s.property.style},null,8,["type","data","styles"])])),_:2},1032,["styles"])))),128))])),_:1},8,["bgStyle","navbarStyle"])}}};export{x as default};

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-aftersale-apply.ac42ba4b.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-aftersale-detail.b95d03a4.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-aftersale-list.36b4044c.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-aftersale-list.db60f6a7.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-order-aftersale-log.f328a5cb.js → unpackage/dist/build/web/assets/pages-order-aftersale-log.92c8dfbf.js

@@ -1 +1 @@
-import{f as t,g as s,w as a,k as e,E as l,i,u as o,v as n,x as d,s as c,I as r,j as u,z as m,o as f,ak as p,m as _,l as x,r as y,F as g,n as j}from"./index-b9093c96.js";import{_ as b}from"./s-layout.f3d19b34.js";import{_ as h}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.393e85de.js";import"./useGoods.4e351a76.js";const k=h({__name:"log-item",props:{item:{type:Object,default(){}},index:{type:Number,default:0},data:{type:Object,default(){}}},setup:m=>(f,p)=>{const _=r,x=u;return t(),s(x,{class:"log-item ss-flex"},{default:a((()=>[e(x,{class:"log-icon ss-flex-col ss-col-center ss-m-r-20"},{default:a((()=>[e(_,{class:l(["cicon-title",0===m.index?"activity-color":""])},null,8,["class"]),m.data.length-1!==m.index?(t(),s(x,{key:0,class:"line"})):i("",!0)])),_:1}),e(x,null,{default:a((()=>[e(x,{class:"text"},{default:a((()=>[o(n(m.item.content),1)])),_:1}),e(x,{class:"date"},{default:a((()=>[o(n(d(c).$helper.timeFormat(m.item.createTime,"yyyy-mm-dd hh:MM:ss")),1)])),_:1})])),_:1})])),_:1})}},[["__scopeId","data-v-bbeb067c"]]),v=h({__name:"log",setup(l){const i=m({list:[]});return f((t=>{i.aftersaleId=t.id,async function(t){const{data:s}=await p.getAfterSaleLogList(t);i.list=s}(t.id)})),(l,o)=>{const n=u,d=_(j("s-layout"),b);return t(),s(d,{title:"售后进度"},{default:a((()=>[e(n,{class:"log-box"},{default:a((()=>[(t(!0),x(g,null,y(i.list,((l,o)=>(t(),s(n,{key:l.id},{default:a((()=>[e(k,{item:l,index:o,data:i.list},null,8,["item","index","data"])])),_:2},1024)))),128))])),_:1})])),_:1})}}},[["__scopeId","data-v-b61de3f9"]]);export{v as default};
+import{f as t,g as s,w as a,k as e,E as l,i,u as o,v as n,x as d,s as c,I as u,j as r,z as m,o as f,ak as p,m as _,l as x,r as y,F as g,n as j}from"./index-8c839130.js";import{_ as b}from"./s-layout.8d369813.js";import{_ as h}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.a60c1c3d.js";import"./useGoods.77887027.js";const k=h({__name:"log-item",props:{item:{type:Object,default(){}},index:{type:Number,default:0},data:{type:Object,default(){}}},setup:m=>(f,p)=>{const _=u,x=r;return t(),s(x,{class:"log-item ss-flex"},{default:a((()=>[e(x,{class:"log-icon ss-flex-col ss-col-center ss-m-r-20"},{default:a((()=>[e(_,{class:l(["cicon-title",0===m.index?"activity-color":""])},null,8,["class"]),m.data.length-1!==m.index?(t(),s(x,{key:0,class:"line"})):i("",!0)])),_:1}),e(x,null,{default:a((()=>[e(x,{class:"text"},{default:a((()=>[o(n(m.item.content),1)])),_:1}),e(x,{class:"date"},{default:a((()=>[o(n(d(c).$helper.timeFormat(m.item.createTime,"yyyy-mm-dd hh:MM:ss")),1)])),_:1})])),_:1})])),_:1})}},[["__scopeId","data-v-bbeb067c"]]),v=h({__name:"log",setup(l){const i=m({list:[]});return f((t=>{i.aftersaleId=t.id,async function(t){const{data:s}=await p.getAfterSaleLogList(t);i.list=s}(t.id)})),(l,o)=>{const n=r,d=_(j("s-layout"),b);return t(),s(d,{title:"售后进度"},{default:a((()=>[e(n,{class:"log-box"},{default:a((()=>[(t(!0),x(g,null,y(i.list,((l,o)=>(t(),s(n,{key:l.id},{default:a((()=>[e(k,{item:l,index:o,data:i.list},null,8,["item","index","data"])])),_:2},1024)))),128))])),_:1})])),_:1})}}},[["__scopeId","data-v-b61de3f9"]]);export{v as default};

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-aftersale-return-delivery.640bd625.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-confirm.364c27c6.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-confirm.92f91569.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-detail.b0b2d189.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-express-log.e2f858c7.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-list.b98509d8.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-list.e2701567.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-order-otherlist.ae5746be.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-index.0da3ca21.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-index.a0bc28cb.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-recharge-log.4cbdb21b.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-recharge-log.a39e96ff.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-recharge.fe4345d3.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-result.3ddd00b1.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-result.f7611e4a.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-resultYuan.4405a43b.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-pay-resultYuan.6668ed56.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-public-error.c54d8b2d.js → unpackage/dist/build/web/assets/pages-public-error.f83f7b59.js

@@ -1 +1 @@
-import{N as t,o as e,f as o,g as n,w as a,j as s,i as r,b6 as i,bT as c,m as p,n as l}from"./index-b9093c96.js";import{_ as u}from"./s-empty.41dcbc14.js";import{_}from"./_plugin-vue_export-helper.1b428a4d.js";/* empty css                                                                */const m=_({__name:"error",setup(_){const m=t(""),x=t("");async function y(){i({url:"/pages/index/index"}),await c()}return e((t=>{m.value=t.errCode,x.value=t.errMsg})),(t,e)=>{const i=p(l("s-empty"),u),c=s;return o(),n(c,{class:"error-page"},{default:a((()=>["NetworkError"===m.value?(o(),n(i,{key:0,icon:"/static/internet-empty.png",text:"网络连接失败",showAction:"",actionText:"重新连接",onClickAction:y,buttonColor:"#132b85"})):"TemplateError"===m.value?(o(),n(i,{key:1,icon:"/static/internet-empty.png",text:"未找到模板",showAction:"",actionText:"重新加载",onClickAction:y,buttonColor:"#132b85"})):""!==m.value?(o(),n(i,{key:2,icon:"/static/internet-empty.png",text:x.value,showAction:"",actionText:"重新加载",onClickAction:y,buttonColor:"#132b85"},null,8,["text"])):r("",!0)])),_:1})}}},[["__scopeId","data-v-189d7116"]]);export{m as default};
+import{N as t,o as e,f as o,g as n,w as a,j as s,i as r,b6 as i,bT as c,m as l,n as p}from"./index-8c839130.js";import{_ as u}from"./s-empty.6fc659af.js";import{_}from"./_plugin-vue_export-helper.1b428a4d.js";/* empty css                                                                */const m=_({__name:"error",setup(_){const m=t(""),x=t("");async function y(){i({url:"/pages/index/index"}),await c()}return e((t=>{m.value=t.errCode,x.value=t.errMsg})),(t,e)=>{const i=l(p("s-empty"),u),c=s;return o(),n(c,{class:"error-page"},{default:a((()=>["NetworkError"===m.value?(o(),n(i,{key:0,icon:"/static/internet-empty.png",text:"网络连接失败",showAction:"",actionText:"重新连接",onClickAction:y,buttonColor:"#132b85"})):"TemplateError"===m.value?(o(),n(i,{key:1,icon:"/static/internet-empty.png",text:"未找到模板",showAction:"",actionText:"重新加载",onClickAction:y,buttonColor:"#132b85"})):""!==m.value?(o(),n(i,{key:2,icon:"/static/internet-empty.png",text:x.value,showAction:"",actionText:"重新加载",onClickAction:y,buttonColor:"#132b85"},null,8,["text"])):r("",!0)])),_:1})}}},[["__scopeId","data-v-189d7116"]]);export{m as default};

+ 0 - 1
unpackage/dist/build/web/assets/pages-public-faq.2d9af006.js

@@ -1 +0,0 @@
-import{z as s,o as t,s as e,f as a,g as l,w as o,m as n,k as r,l as i,r as c,F as p,i as u,n as _,u as m,v as d,j as f,I as g}from"./index-b9093c96.js";import{_ as y,a as j}from"./uni-collapse.2b5f7b82.js";import{_ as x}from"./s-empty.41dcbc14.js";import{_ as b}from"./s-layout.f3d19b34.js";import{_ as h}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.393e85de.js";/* empty css                                                                */import"./useGoods.4e351a76.js";const v=h({__name:"faq",setup(h){const v=s({list:[],loading:!0});return t((()=>{e.$router.go("/pages/public/richtext",{title:"常见问题"})})),(s,t)=>{const e=f,h=g,k=n(_("uni-collapse-item"),y),F=n(_("uni-collapse"),j),w=n(_("s-empty"),x),I=n(_("s-layout"),b);return a(),l(I,{class:"set-wrap",title:"常见问题",bgStyle:{color:"#FFF"}},{default:o((()=>[r(F,null,{default:o((()=>[(a(!0),i(p,null,c(v.list,((s,t)=>(a(),l(k,{key:s},{title:o((()=>[r(e,{class:"ss-flex ss-col-center header"},{default:o((()=>[r(e,{class:"ss-m-l-20 ss-m-r-20 icon"},{default:o((()=>[r(e,{class:"rectangle"},{default:o((()=>[r(e,{class:"num ss-flex ss-row-center ss-col-center"},{default:o((()=>[m(d(t+1<10?"0"+(t+1):t+1),1)])),_:2},1024)])),_:2},1024),r(e,{class:"triangle"})])),_:2},1024),r(e,{class:"title ss-m-t-36 ss-m-b-36"},{default:o((()=>[m(d(s.title),1)])),_:2},1024)])),_:2},1024)])),default:o((()=>[r(e,{class:"content ss-p-l-78 ss-p-r-40 ss-p-b-50 ss-p-t-20"},{default:o((()=>[r(h,{class:"text"},{default:o((()=>[m(d(s.content),1)])),_:2},1024)])),_:2},1024)])),_:2},1024)))),128))])),_:1}),0!==v.list.length||v.loading?u("",!0):(a(),l(w,{key:0,text:"暂无常见问题",icon:"/static/collect-empty.png"}))])),_:1})}}},[["__scopeId","data-v-d403c664"]]);export{v as default};

+ 1 - 0
unpackage/dist/build/web/assets/pages-public-faq.da91eb0a.js

@@ -0,0 +1 @@
+import{z as s,o as t,s as e,f as a,g as l,w as o,m as n,k as r,l as c,r as i,F as p,i as u,n as _,u as m,v as d,j as f,I as g}from"./index-8c839130.js";import{_ as y,a as j}from"./uni-collapse.f7fcb381.js";import{_ as x}from"./s-empty.6fc659af.js";import{_ as v}from"./s-layout.8d369813.js";import{_ as b}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.a60c1c3d.js";/* empty css                                                                */import"./useGoods.77887027.js";const h=b({__name:"faq",setup(b){const h=s({list:[],loading:!0});return t((()=>{e.$router.go("/pages/public/richtext",{title:"常见问题"})})),(s,t)=>{const e=f,b=g,k=n(_("uni-collapse-item"),y),F=n(_("uni-collapse"),j),w=n(_("s-empty"),x),z=n(_("s-layout"),v);return a(),l(z,{class:"set-wrap",title:"常见问题",bgStyle:{color:"#FFF"}},{default:o((()=>[r(F,null,{default:o((()=>[(a(!0),c(p,null,i(h.list,((s,t)=>(a(),l(k,{key:s},{title:o((()=>[r(e,{class:"ss-flex ss-col-center header"},{default:o((()=>[r(e,{class:"ss-m-l-20 ss-m-r-20 icon"},{default:o((()=>[r(e,{class:"rectangle"},{default:o((()=>[r(e,{class:"num ss-flex ss-row-center ss-col-center"},{default:o((()=>[m(d(t+1<10?"0"+(t+1):t+1),1)])),_:2},1024)])),_:2},1024),r(e,{class:"triangle"})])),_:2},1024),r(e,{class:"title ss-m-t-36 ss-m-b-36"},{default:o((()=>[m(d(s.title),1)])),_:2},1024)])),_:2},1024)])),default:o((()=>[r(e,{class:"content ss-p-l-78 ss-p-r-40 ss-p-b-50 ss-p-t-20"},{default:o((()=>[r(b,{class:"text"},{default:o((()=>[m(d(s.content),1)])),_:2},1024)])),_:2},1024)])),_:2},1024)))),128))])),_:1}),0!==h.list.length||h.loading?u("",!0):(a(),l(w,{key:0,text:"暂无常见问题",icon:"/static/collect-empty.png"}))])),_:1})}}},[["__scopeId","data-v-d403c664"]]);export{h as default};

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-public-merchant.dc6baeaf.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-public-merchantApplyList.753f4940.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-public-merchantApplyList.d9e493f2.js


+ 1 - 0
unpackage/dist/build/web/assets/pages-public-richtext.260b66c5.js

@@ -0,0 +1 @@
+import{z as t,o as e,bm as s,f as l,g as i,w as n,aO as o,m as a,k as c,n as r,j as p}from"./index-8c839130.js";import{_ as m}from"./mp-html.9cff5a54.js";import{_ as u}from"./s-layout.8d369813.js";import{_ as d}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.a60c1c3d.js";import"./useGoods.77887027.js";const f=d({__name:"richtext",props:{title:{defautls:"",type:String},type:{defautls:"",type:String}},setup(d){const f=t({title:"",content:""});const y=d;return e((t=>{(t.title||y.title)&&(f.title=t.title||y.title,s({title:f.title||y.title})),async function(t,e){const{code:l,data:i}=await o.getArticle(t,e);0===l&&(f.content=i.content,f.title!==i.title&&(f.title=i.title,s({title:f.title})))}(t.id,t.title||y.title)})),(t,e)=>{const s=a(r("mp-html"),m),o=p,y=a(r("s-layout"),u);return f.title&&!d.type?(l(),i(y,{key:0,class:"set-wrap",title:f.title,bgStyle:{color:"#FFF"}},{default:n((()=>[c(o,{class:"ss-p-30"},{default:n((()=>[c(s,{class:"richtext",content:f.content},null,8,["content"])])),_:1})])),_:1},8,["title"])):(l(),i(s,{key:1,class:"richtext",content:f.content},null,8,["content"]))}}},[["__scopeId","data-v-5342d437"]]);export{f as default};

+ 0 - 1
unpackage/dist/build/web/assets/pages-public-richtext.cbb75320.js

@@ -1 +0,0 @@
-import{z as t,o as e,bm as s,f as l,g as i,w as n,aO as o,m as a,k as r,n as c,j as p}from"./index-b9093c96.js";import{_ as m}from"./mp-html.91076c61.js";import{_ as u}from"./s-layout.f3d19b34.js";import{_ as d}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.393e85de.js";import"./useGoods.4e351a76.js";const f=d({__name:"richtext",props:{title:{defautls:"",type:String},type:{defautls:"",type:String}},setup(d){const f=t({title:"",content:""});const _=d;return e((t=>{(t.title||_.title)&&(f.title=t.title||_.title,s({title:f.title||_.title})),async function(t,e){const{code:l,data:i}=await o.getArticle(t,e);0===l&&(f.content=i.content,f.title!==i.title&&(f.title=i.title,s({title:f.title})))}(t.id,t.title||_.title)})),(t,e)=>{const s=a(c("mp-html"),m),o=p,_=a(c("s-layout"),u);return f.title&&!d.type?(l(),i(_,{key:0,class:"set-wrap",title:f.title,bgStyle:{color:"#FFF"}},{default:n((()=>[r(o,{class:"ss-p-30"},{default:n((()=>[r(s,{class:"richtext",content:f.content},null,8,["content"])])),_:1})])),_:1},8,["title"])):(l(),i(s,{key:1,class:"richtext",content:f.content},null,8,["content"]))}}},[["__scopeId","data-v-5342d437"]]);export{f as default};

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-public-setting.c21f981e.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-public-webview.9fe51745.js → unpackage/dist/build/web/assets/pages-public-webview.9ea71ef4.js

@@ -1 +1 @@
-import{N as s,o as e,f as a,g as n,w as t,j as o,k as r,bU as u}from"./index-b9093c96.js";const l={__name:"webview",setup(l){const c=s("");return e((s=>{c.value=decodeURIComponent(s.url)})),(s,e)=>{const l=u,d=o;return a(),n(d,null,{default:t((()=>[r(l,{src:c.value},null,8,["src"])])),_:1})}}};export{l as default};
+import{N as s,o as e,f as a,g as n,w as t,j as o,k as r,bU as u}from"./index-8c839130.js";const l={__name:"webview",setup(l){const c=s("");return e((s=>{c.value=decodeURIComponent(s.url)})),(s,e)=>{const l=u,d=o;return a(),n(d,null,{default:t((()=>[r(l,{src:c.value},null,8,["src"])])),_:1})}}};export{l as default};

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-shop-index.e59e3c50.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-address-edit.4f0f0d43.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-address-list.838a4782.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-dummyAddress-edit.2475c693.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-user-dummyAddress-list.c6b22063.js → unpackage/dist/build/web/assets/pages-user-dummyAddress-list.cbd9e19b.js

@@ -1 +1 @@
-import{z as s,p as a,aF as t,O as e,Q as o,aG as r,q as i,f as l,g as d,w as n,m as p,l as u,r as m,F as _,i as c,k as f,x as y,s as g,u as j,n as b,j as k,J as x,aH as h}from"./index-b9093c96.js";import{_ as v}from"./s-address-item.0b168d1c.js";import{a as w,_ as F}from"./s-layout.f3d19b34.js";import{_ as S}from"./s-empty.41dcbc14.js";import{_ as A}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.393e85de.js";import"./useGoods.4e351a76.js";/* empty css                                                                */const C=A({__name:"list",setup(A){const C=s({list:[],loading:!0});return a((async()=>{C.list=(await t.getAddressList(2)).data,C.loading=!1})),e((()=>{o("areaData")||r.getAreaTree().then((s=>{0===s.code&&i("areaData",s.data)}))})),(s,a)=>{const t=p(b("s-address-item"),v),e=k,o=x,r=p(b("su-fixed"),w),i=p(b("s-empty"),S),A=p(b("s-layout"),F);return l(),d(A,{title:"虚拟商品收货地址",bgStyle:{color:"#FFF"}},{default:n((()=>[C.list.length?(l(),d(e,{key:0},{default:n((()=>[(l(!0),u(_,null,m(C.list,(s=>(l(),d(t,{spuType:"0",hasBorderBottom:"",key:s.id,item:s,onClick:a=>(h("SELECT_ADDRESS",{addressInfo:s}),void g.$router.back())},null,8,["item","onClick"])))),128))])),_:1})):c("",!0),f(r,{bottom:"",placeholder:""},{default:n((()=>[f(e,{class:"footer-box ss-flex ss-row-between ss-p-20"},{default:n((()=>[f(o,{class:"add-btn ss-reset-button ui-Shadow-Main",onClick:a[0]||(a[0]=s=>y(g).$router.go("/pages/user/dummyAddress/edit"))},{default:n((()=>[j(" 新增收货地址 ")])),_:1})])),_:1})])),_:1}),0!==C.list.length||C.loading?c("",!0):(l(),d(i,{key:1,text:"暂无收货地址",icon:"/static/data-empty.png"}))])),_:1})}}},[["__scopeId","data-v-79fb41c9"]]);export{C as default};
+import{z as s,p as a,aF as t,O as e,Q as o,aG as r,q as i,f as l,g as d,w as n,m as p,l as u,r as m,F as _,i as c,k as f,x as y,s as g,u as j,n as b,j as k,J as x,aH as h}from"./index-8c839130.js";import{_ as v}from"./s-address-item.0de6b65a.js";import{a as w,_ as F}from"./s-layout.8d369813.js";import{_ as S}from"./s-empty.6fc659af.js";import{_ as A}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.a60c1c3d.js";import"./useGoods.77887027.js";/* empty css                                                                */const C=A({__name:"list",setup(A){const C=s({list:[],loading:!0});return a((async()=>{C.list=(await t.getAddressList(2)).data,C.loading=!1})),e((()=>{o("areaData")||r.getAreaTree().then((s=>{0===s.code&&i("areaData",s.data)}))})),(s,a)=>{const t=p(b("s-address-item"),v),e=k,o=x,r=p(b("su-fixed"),w),i=p(b("s-empty"),S),A=p(b("s-layout"),F);return l(),d(A,{title:"虚拟商品收货地址",bgStyle:{color:"#FFF"}},{default:n((()=>[C.list.length?(l(),d(e,{key:0},{default:n((()=>[(l(!0),u(_,null,m(C.list,(s=>(l(),d(t,{spuType:"0",hasBorderBottom:"",key:s.id,item:s,onClick:a=>(h("SELECT_ADDRESS",{addressInfo:s}),void g.$router.back())},null,8,["item","onClick"])))),128))])),_:1})):c("",!0),f(r,{bottom:"",placeholder:""},{default:n((()=>[f(e,{class:"footer-box ss-flex ss-row-between ss-p-20"},{default:n((()=>[f(o,{class:"add-btn ss-reset-button ui-Shadow-Main",onClick:a[0]||(a[0]=s=>y(g).$router.go("/pages/user/dummyAddress/edit"))},{default:n((()=>[j(" 新增收货地址 ")])),_:1})])),_:1})])),_:1}),0!==C.list.length||C.loading?c("",!0):(l(),d(i,{key:1,text:"暂无收货地址",icon:"/static/data-empty.png"}))])),_:1})}}},[["__scopeId","data-v-79fb41c9"]]);export{C as default};

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-goods-collect.d33b5d03.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-goods-log.5f10bc47.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-info.82e9ce2c.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-invoice-edit.37ad388e.js


+ 1 - 1
unpackage/dist/build/web/assets/pages-user-invoice-list.5256ad37.js → unpackage/dist/build/web/assets/pages-user-invoice-list.c378298d.js

@@ -1 +1 @@
-import{z as s,p as a,aF as t,O as e,Q as o,aG as i,q as r,f as l,g as d,w as n,m as p,l as u,r as m,F as _,i as c,k as f,x as g,s as y,u as j,n as b,j as k,J as x,aH as h}from"./index-b9093c96.js";import{_ as v}from"./s-address-item.0b168d1c.js";import{a as w,_ as F}from"./s-layout.f3d19b34.js";import{_ as S}from"./s-empty.41dcbc14.js";import{_ as C}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.393e85de.js";import"./useGoods.4e351a76.js";/* empty css                                                                */const D=C({__name:"list",setup(C){const D=s({list:[],loading:!0});return a((async()=>{D.list=(await t.getAddressList()).data,D.loading=!1})),e((()=>{o("areaData")||i.getAreaTree().then((s=>{0===s.code&&r("areaData",s.data)}))})),(s,a)=>{const t=p(b("s-address-item"),v),e=k,o=x,i=p(b("su-fixed"),w),r=p(b("s-empty"),S),C=p(b("s-layout"),F);return l(),d(C,{title:"发票抬头管理",bgStyle:{color:"#FFF"}},{default:n((()=>[D.list.length?(l(),d(e,{key:0},{default:n((()=>[(l(!0),u(_,null,m(D.list,(s=>(l(),d(t,{hasBorderBottom:"",key:s.id,item:s,onClick:a=>(h("SELECT_ADDRESS",{addressInfo:s}),void y.$router.back())},null,8,["item","onClick"])))),128))])),_:1})):c("",!0),f(i,{bottom:"",placeholder:""},{default:n((()=>[f(e,{class:"footer-box ss-flex ss-row-between ss-p-20"},{default:n((()=>[f(o,{class:"add-btn ss-reset-button ui-Shadow-Main",onClick:a[0]||(a[0]=s=>g(y).$router.go("/pages/user/invoice/edit"))},{default:n((()=>[j(" 新增发票抬头 ")])),_:1})])),_:1})])),_:1}),0!==D.list.length||D.loading?c("",!0):(l(),d(r,{key:1,text:"暂无发票抬头",icon:"/static/data-empty.png"}))])),_:1})}}},[["__scopeId","data-v-0bd54ac4"]]);export{D as default};
+import{z as s,p as a,aF as t,O as e,Q as o,aG as i,q as r,f as l,g as d,w as n,m as p,l as u,r as m,F as _,i as c,k as f,x as g,s as y,u as j,n as b,j as k,J as x,aH as h}from"./index-8c839130.js";import{_ as v}from"./s-address-item.0de6b65a.js";import{a as w,_ as F}from"./s-layout.8d369813.js";import{_ as S}from"./s-empty.6fc659af.js";import{_ as C}from"./_plugin-vue_export-helper.1b428a4d.js";import"./phone-international-input.a60c1c3d.js";import"./useGoods.77887027.js";/* empty css                                                                */const D=C({__name:"list",setup(C){const D=s({list:[],loading:!0});return a((async()=>{D.list=(await t.getAddressList()).data,D.loading=!1})),e((()=>{o("areaData")||i.getAreaTree().then((s=>{0===s.code&&r("areaData",s.data)}))})),(s,a)=>{const t=p(b("s-address-item"),v),e=k,o=x,i=p(b("su-fixed"),w),r=p(b("s-empty"),S),C=p(b("s-layout"),F);return l(),d(C,{title:"发票抬头管理",bgStyle:{color:"#FFF"}},{default:n((()=>[D.list.length?(l(),d(e,{key:0},{default:n((()=>[(l(!0),u(_,null,m(D.list,(s=>(l(),d(t,{hasBorderBottom:"",key:s.id,item:s,onClick:a=>(h("SELECT_ADDRESS",{addressInfo:s}),void y.$router.back())},null,8,["item","onClick"])))),128))])),_:1})):c("",!0),f(i,{bottom:"",placeholder:""},{default:n((()=>[f(e,{class:"footer-box ss-flex ss-row-between ss-p-20"},{default:n((()=>[f(o,{class:"add-btn ss-reset-button ui-Shadow-Main",onClick:a[0]||(a[0]=s=>g(y).$router.go("/pages/user/invoice/edit"))},{default:n((()=>[j(" 新增发票抬头 ")])),_:1})])),_:1})])),_:1}),0!==D.list.length||D.loading?c("",!0):(l(),d(r,{key:1,text:"暂无发票抬头",icon:"/static/data-empty.png"}))])),_:1})}}},[["__scopeId","data-v-0bd54ac4"]]);export{D as default};

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
unpackage/dist/build/web/assets/pages-user-qrcode-share.64208afa.js


Vissa filer visades inte eftersom för många filer har ändrats