fix:1.未设置密码支付 需要先设置

pages/order/confirm.vue

@@ -231,7 +231,7 @@
 	import {
 		isAndroid,
 	} from '@/sheep/hooks/useApp'
-	import { showInputPayPassword,showWalletModal } from '@/sheep/hooks/useModal';
+	import { showInputPayPassword,showWalletModal,showSetPayPassword } from '@/sheep/hooks/useModal';
 	const Android = isAndroid();
 	const state = reactive({
 		orderPayload: {},
@@ -338,6 +338,15 @@
 				const shop = shops[shopName];
 				shopRemarks[shop.shopId] = shop.remark;
 			});
+			
+			// 判断用户是否设置了支付密码,如果没有设置支付密码，就先设置支付密码
+			const userInfo = computed(() => sheep.$store('user').userInfo);
+			if(!userInfo.value.havePayPassword){
+				sheep.$helper.toast("请先设置支付密码后再操作")
+				showSetPayPassword()
+				return false
+			}
+
 			// 如果不是高精度商品 就走原来的程序，如果是高精度的商品，就拿到高精度返回的商品总价 / 100 然后保留四位小数再干掉两位，实现佣金可以刚好大于当前佣金的0.01
 			const usedPoint = state.orderPayload.highPrecision ? customRound((state.orderInfo.price.virtualPayPrice / 100 ), 2):  state.usedPoint;
 			const {

pages/user/wallet/consumptionLog.vue

@@ -11,21 +11,25 @@
 						style="padding:0;padding: 20rpx 0;border-bottom: 1px solid #c4c4c4;">
 						<view class="ss-flex ss-col-center" style="width: 100%;">
 							<view class="ss-flex ss-m-t-10"
-								style="flex-direction: column;align-items: flex-start;width: 100%;" >
-								<view class="name" style="width: 100%;"> {{ item.consumptionStatusName }} {{
-									[11].includes(item.integralStatus) ? "（" + item.generateUserName + "）" : ""}}
-									 {{ item.ancestorQuotaAmount > 0 ? `(超出金额:${points2point(item.ancestorQuotaAmount)})` : "" }}
+								style="flex-direction: column;align-items: flex-start;width: 100%;">
+								<view class="name" style="width: 100%;">
+									{{ item.consumptionStatusName }}
+									{{ [11].includes(item.integralStatus) ? "（" + item.generateUserName + "）" : "" }}
+									{{ item.ancestorQuotaAmount > 0 ? `(超出金额:${points2point(item.ancestorQuotaAmount)})` : "" }} 
+									{{ [2,3].includes(item.integralStatus) ? `(原积分:${points2point(item.integralPoints)})` : "" }}
+									{{ [4,5].includes(item.integralStatus) ? `(${item.generateUserName})` : "" }}
+									
 									<text style="float: right;" class="color-red"
 										:class="{ 'color-green': item.practicalIntegralPoints < 0 }">
-										{{ item.practicalIntegralPoints > 0 ? '+' + points2point(item.practicalIntegralPoints) :
+										{{ item.practicalIntegralPoints > 0 ? '+' +
+											points2point(item.practicalIntegralPoints) :
 											points2point(item.practicalIntegralPoints)}}
 									</text>
-
 								</view>
 								<view class="time " style="width: 100%;">
 									{{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM') }}
 									<text style="float: right;">{{ t('wallet.balance') }}:{{
-										points2point(item.afterIntegralPoints)}}</text>
+										points2point(item.afterIntegralPoints) }}</text>
 								</view>
 							</view>
 						</view>
@@ -38,13 +42,15 @@
 						style="padding:0;padding: 20rpx 0;border-bottom: 1px solid #c4c4c4;">
 						<view class="ss-flex ss-col-center" style="width: 100%;">
 							<view class="ss-flex ss-m-t-10"
-								style="flex-direction: column;align-items: flex-start;width: 100%;" >
+								style="flex-direction: column;align-items: flex-start;width: 100%;">
 								<view class="name" style="width: 100%;"> {{ item.consumptionStatusName }} {{
-									[11].includes(item.integralStatus) ? "（" + item.generateUserName + "）" : ""}}
-									 {{ item.ancestorQuotaAmount > 0 ? `(超出金额:${points2point(item.ancestorQuotaAmount)})` : "" }}
+									[11].includes(item.integralStatus) ? "（" + item.generateUserName + "）" : "" }}
+									{{ item.ancestorQuotaAmount > 0 ? `(超出金额:${points2point(item.ancestorQuotaAmount)})`
+									: "" }}
 									<text style="float: right;" class="color-red"
 										:class="{ 'color-green': item.maxAvailablePointsAmount < 0 }">
-										{{ item.maxAvailablePointsAmount > 0 ? '+' + points2point(item.maxAvailablePointsAmount) :
+										{{ item.maxAvailablePointsAmount > 0 ? '+' +
+											points2point(item.maxAvailablePointsAmount) :
 											points2point(item.maxAvailablePointsAmount)}}
 									</text>
 
@@ -52,7 +58,7 @@
 								<view class="time " style="width: 100%;">
 									{{ sheep.$helper.timeFormat(item.createTime, 'yyyy-mm-dd hh:MM') }}
 									<text style="float: right;">{{ t('wallet.balance') }}:{{
-										points2point(item.afterMaxAvailablePointsAmount)}}</text>
+										points2point(item.afterMaxAvailablePointsAmount) }}</text>
 								</view>
 							</view>
 						</view>

sheep/components/s-pay-password/s-pay-password.vue

@@ -117,6 +117,7 @@
               })
               callback?.(inputPassword)
             }
+            window.location.reload()
             hidePayPassword()
           } catch (error) {
             uni.showToast({

sheep/hooks/useModal.js

@@ -192,8 +192,10 @@ export function showInputPayPassword(callback,onCancel) {
 			}
 		})
 	}else{
-		sheep.$helper.toast("请先设置支付密码后再操作")
+		
 		showSetPayPassword()
+		onCancel()
+		sheep.$helper.toast("请先设置支付密码后再操作")
 	}
 	
   }

unpackage/dist/build/web/assets/comment-item.B7DwT9wz.js → unpackage/dist/build/web/assets/comment-item.B9VBBsGT.js

@@ -1 +1 @@
-import{a as s,b as e,e as a,d as l,w as t,f as r,g as i,j as c,x as m,F as u,y as n,z as o,k as d,i as p,K as f}from"./index-DpMnyBR1.js";import{_}from"./uni-rate.692U5mM7.js";import{_ as y}from"./su-image.B5FOta3P.js";import{_ as x}from"./_plugin-vue_export-helper.BCo6x5W8.js";const v=x({__name:"comment-item",props:{item:{type:Object,default(){}}},setup:x=>(v,g)=>{const b=d,h=p,j=s(e("uni-rate"),_),k=s(e("su-image"),y),w=f;return a(),l(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(b,{class:"avatar",src:x.item.userAvatar},null,8,["src"])])),_:1}),r(h,{class:"nickname ss-m-r-20"},{default:t((()=>[i(c(x.item.userNickname),1)])),_:1}),r(h,{class:""},{default:t((()=>[r(j,{readonly:!0,modelValue:x.item.scores,"onUpdate:modelValue":g[0]||(g[0]=s=>x.item.scores=s),size:"18"},null,8,["modelValue"])])),_:1})])),_:1}),r(h,{class:"content"},{default:t((()=>[i(c(x.item.content),1)])),_:1}),(null==(s=x.item.picUrls)?void 0:s.length)?(a(),l(h,{key:0,class:"ss-m-t-24"},{default:t((()=>[r(w,{class:"scroll-box","scroll-x":"","scroll-anchoring":""},{default:t((()=>[r(h,{class:"ss-flex"},{default:t((()=>[(a(!0),m(u,null,n(x.item.picUrls,((s,e)=>(a(),l(h,{key:s,class:"ss-m-r-10"},{default:t((()=>[r(k,{class:"content-img",isPreview:"",previewList:x.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),x.item.replyTime?(a(),l(h,{key:1,class:"ss-m-t-20 reply-box"},{default:t((()=>[r(h,{class:"reply-title"},{default:t((()=>[i("商家回复：")])),_:1}),r(h,{class:"reply-content"},{default:t((()=>[i(c(x.item.replyContent),1)])),_:1})])),_:1})):o("",!0)]})),_:1})}},[["__scopeId","data-v-9df53e2b"]]);export{v as c};
+import{a as s,b as e,e as a,d as l,w as t,f as r,g as i,j as c,x as m,F as u,y as n,z as o,k as d,i as p,K as f}from"./index-B0rP7TUE.js";import{_}from"./uni-rate.C6WZu7Ya.js";import{_ as y}from"./su-image.BacWtWKH.js";import{_ as x}from"./_plugin-vue_export-helper.BCo6x5W8.js";const v=x({__name:"comment-item",props:{item:{type:Object,default(){}}},setup:x=>(v,g)=>{const b=d,h=p,j=s(e("uni-rate"),_),k=s(e("su-image"),y),w=f;return a(),l(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(b,{class:"avatar",src:x.item.userAvatar},null,8,["src"])])),_:1}),r(h,{class:"nickname ss-m-r-20"},{default:t((()=>[i(c(x.item.userNickname),1)])),_:1}),r(h,{class:""},{default:t((()=>[r(j,{readonly:!0,modelValue:x.item.scores,"onUpdate:modelValue":g[0]||(g[0]=s=>x.item.scores=s),size:"18"},null,8,["modelValue"])])),_:1})])),_:1}),r(h,{class:"content"},{default:t((()=>[i(c(x.item.content),1)])),_:1}),(null==(s=x.item.picUrls)?void 0:s.length)?(a(),l(h,{key:0,class:"ss-m-t-24"},{default:t((()=>[r(w,{class:"scroll-box","scroll-x":"","scroll-anchoring":""},{default:t((()=>[r(h,{class:"ss-flex"},{default:t((()=>[(a(!0),m(u,null,n(x.item.picUrls,((s,e)=>(a(),l(h,{key:s,class:"ss-m-r-10"},{default:t((()=>[r(k,{class:"content-img",isPreview:"",previewList:x.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),x.item.replyTime?(a(),l(h,{key:1,class:"ss-m-t-20 reply-box"},{default:t((()=>[r(h,{class:"reply-title"},{default:t((()=>[i("商家回复：")])),_:1}),r(h,{class:"reply-content"},{default:t((()=>[i(c(x.item.replyContent),1)])),_:1})])),_:1})):o("",!0)]})),_:1})}},[["__scopeId","data-v-9df53e2b"]]);export{v as c};

unpackage/dist/build/web/assets/confirm-CVo8LDNt.css

@@ -1 +0,0 @@
-[data-v-21b3f490] .uni-input-wrapper{width:10rem}[data-v-21b3f490] .uni-easyinput__content-input{font-size:.875rem;height:2.25rem;text-align:right!important;padding-right:0!important}[data-v-21b3f490] .uni-easyinput__content-input .uni-input-input{font-weight:500;color:#333;font-size:.8125rem;height:1rem;margin-top:.125rem}[data-v-21b3f490] .uni-easyinput__content{display:flex!important;align-items:center!important;justify-content:right!important}.order-card-box[data-v-21b3f490],.address-box[data-v-21b3f490],.total-card-box[data-v-21b3f490]{background:#fff;margin:.625rem;border-radius:.625rem}.title-text[data-v-21b3f490]{font-size:.9375rem;font-weight:700;line-height:1.3125rem}.score-img[data-v-21b3f490]{width:1.125rem;height:1.125rem;margin:0 .125rem}.order-item[data-v-21b3f490]{height:2.5rem}.order-item .item-title[data-v-21b3f490]{font-size:.875rem;font-weight:400}.order-item .item-value[data-v-21b3f490]{font-size:.875rem;font-weight:500;font-family:OPPOSANS}.order-item .text-disabled[data-v-21b3f490]{color:#bbb}.order-item .item-icon[data-v-21b3f490]{color:#999}.order-item .remark-input[data-v-21b3f490]{text-align:right}.order-item .item-placeholder[data-v-21b3f490]{color:#999;font-size:.8125rem;text-align:right}.total-box-footer[data-v-21b3f490]{height:2.8125rem}.total-box-footer .total-num[data-v-21b3f490]{color:#333;font-family:OPPOSANS}.footer-box[data-v-21b3f490]{height:3.125rem}.footer-box .submit-btn[data-v-21b3f490]{width:7.1875rem;height:2.1875rem;font-size:.875rem;font-weight:500}.footer-box .submit-btn .goto-pay-text[data-v-21b3f490]{line-height:.875rem}.footer-box .cancel-btn[data-v-21b3f490]{width:7.1875rem;height:2.5rem;font-size:.8125rem;background-color:#e5e5e5;color:#999}.title[data-v-21b3f490]{font-size:1.125rem;font-weight:700;color:#333}.subtitle[data-v-21b3f490]{font-size:.875rem;color:#999}.cicon-checkbox[data-v-21b3f490]{font-size:1.125rem;color:var(--ui-BG-Main)}.cicon-box[data-v-21b3f490]{font-size:1.125rem;color:#999}

unpackage/dist/build/web/assets/confirm-CnTner7D.css

@@ -0,0 +1 @@
+[data-v-e7fc743f] .uni-input-wrapper{width:10rem}[data-v-e7fc743f] .uni-easyinput__content-input{font-size:.875rem;height:2.25rem;text-align:right!important;padding-right:0!important}[data-v-e7fc743f] .uni-easyinput__content-input .uni-input-input{font-weight:500;color:#333;font-size:.8125rem;height:1rem;margin-top:.125rem}[data-v-e7fc743f] .uni-easyinput__content{display:flex!important;align-items:center!important;justify-content:right!important}.order-card-box[data-v-e7fc743f],.address-box[data-v-e7fc743f],.total-card-box[data-v-e7fc743f]{background:#fff;margin:.625rem;border-radius:.625rem}.title-text[data-v-e7fc743f]{font-size:.9375rem;font-weight:700;line-height:1.3125rem}.score-img[data-v-e7fc743f]{width:1.125rem;height:1.125rem;margin:0 .125rem}.order-item[data-v-e7fc743f]{height:2.5rem}.order-item .item-title[data-v-e7fc743f]{font-size:.875rem;font-weight:400}.order-item .item-value[data-v-e7fc743f]{font-size:.875rem;font-weight:500;font-family:OPPOSANS}.order-item .text-disabled[data-v-e7fc743f]{color:#bbb}.order-item .item-icon[data-v-e7fc743f]{color:#999}.order-item .remark-input[data-v-e7fc743f]{text-align:right}.order-item .item-placeholder[data-v-e7fc743f]{color:#999;font-size:.8125rem;text-align:right}.total-box-footer[data-v-e7fc743f]{height:2.8125rem}.total-box-footer .total-num[data-v-e7fc743f]{color:#333;font-family:OPPOSANS}.footer-box[data-v-e7fc743f]{height:3.125rem}.footer-box .submit-btn[data-v-e7fc743f]{width:7.1875rem;height:2.1875rem;font-size:.875rem;font-weight:500}.footer-box .submit-btn .goto-pay-text[data-v-e7fc743f]{line-height:.875rem}.footer-box .cancel-btn[data-v-e7fc743f]{width:7.1875rem;height:2.5rem;font-size:.8125rem;background-color:#e5e5e5;color:#999}.title[data-v-e7fc743f]{font-size:1.125rem;font-weight:700;color:#333}.subtitle[data-v-e7fc743f]{font-size:.875rem;color:#999}.cicon-checkbox[data-v-e7fc743f]{font-size:1.125rem;color:var(--ui-BG-Main)}.cicon-box[data-v-e7fc743f]{font-size:1.125rem;color:#999}

unpackage/dist/build/web/assets/const.BF8O-6yZ.js → unpackage/dist/build/web/assets/const.R0jNpskb.js

@@ -1 +1 @@
-import{br as e}from"./index-DpMnyBR1.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{br as e}from"./index-B0rP7TUE.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};

unpackage/dist/build/web/assets/pages-index-FirstActivity.CWChGSlw.js → unpackage/dist/build/web/assets/pages-index-FirstActivity.C2LAKxCX.js

@@ -1 +1 @@
-import{h as t,r as s,t as i,s as e,m as a,p as r,q as c,a as o,b as n,d as l,w as d,i as p,e as v,f as u}from"./index-DpMnyBR1.js";import{_ as m}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.DhN4GUsH.js";import x from"./pages-index-FirstList.GuCMWPf2.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.CabPTE2z.js";import"./s-search-block.CWo83Zjb.js";import"./s-empty.BAQ-uSii.js";/* empty css                                                                */import"./uni-load-more.BVYhhWsF.js";import"./youjiantou.DF0dutcV.js";const f={__name:"FirstActivity",setup(f){t();const g=s({theme:"red",style:{bgType:"color",bgColor:"#ffffff",color:"#3c3c3c",activeColor:"#1fa380"},items:[{text:i("common.home"),url:"/pages/index/FirstIndex",iconUrl:e.$url.static("/static/firstIndex/index.svg"),activeIconUrl:e.$url.static("/static/firstIndex/index-active.svg")},{text:i("common.activities"),url:"/pages/index/FirstActivity",iconUrl:e.$url.static("/static/firstIndex/activity.svg"),activeIconUrl:e.$url.static("/static/firstIndex/activity-active.svg")},{text:i("common.videos"),url:"/pages/index/FirstVideo",iconUrl:e.$url.static("/static/firstIndex/video.svg"),activeIconUrl:e.$url.static("/static/firstIndex/video-active.svg")},{text:i("common.mall"),url:"/pages/index/index",iconUrl:e.$url.static("/static/firstIndex/shop.svg"),activeIconUrl:e.$url.static("/static/firstIndex/shop-active.svg")}]});return a((()=>{})),r((()=>{setTimeout((function(){c()}),800)})),(t,s)=>{const i=o(n("s-tabbar"),m),e=p;return v(),l(e,{class:"page-body",style:{background:"#f6f6f6"}},{default:d((()=>[u(x,{categoryId:9,type:"activityCard"}),u(i,{path:"/pages/index/FirstActivity",tabbar:g.value},null,8,["tabbar"])])),_:1})}}};export{f as default};
+import{h as t,r as s,t as i,s as e,m as a,p as r,q as c,a as o,b as n,d as l,w as d,i as p,e as v,f as u}from"./index-B0rP7TUE.js";import{_ as m}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.Dl3MijRx.js";import x from"./pages-index-FirstList.CBMPMfHA.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.BwYsQMMS.js";import"./s-search-block.Bmr3VaeA.js";import"./s-empty.lLOx-jys.js";/* empty css                                                                */import"./uni-load-more.Cv9UFAnA.js";import"./youjiantou.DF0dutcV.js";const f={__name:"FirstActivity",setup(f){t();const g=s({theme:"red",style:{bgType:"color",bgColor:"#ffffff",color:"#3c3c3c",activeColor:"#1fa380"},items:[{text:i("common.home"),url:"/pages/index/FirstIndex",iconUrl:e.$url.static("/static/firstIndex/index.svg"),activeIconUrl:e.$url.static("/static/firstIndex/index-active.svg")},{text:i("common.activities"),url:"/pages/index/FirstActivity",iconUrl:e.$url.static("/static/firstIndex/activity.svg"),activeIconUrl:e.$url.static("/static/firstIndex/activity-active.svg")},{text:i("common.videos"),url:"/pages/index/FirstVideo",iconUrl:e.$url.static("/static/firstIndex/video.svg"),activeIconUrl:e.$url.static("/static/firstIndex/video-active.svg")},{text:i("common.mall"),url:"/pages/index/index",iconUrl:e.$url.static("/static/firstIndex/shop.svg"),activeIconUrl:e.$url.static("/static/firstIndex/shop-active.svg")}]});return a((()=>{})),r((()=>{setTimeout((function(){c()}),800)})),(t,s)=>{const i=o(n("s-tabbar"),m),e=p;return v(),l(e,{class:"page-body",style:{background:"#f6f6f6"}},{default:d((()=>[u(x,{categoryId:9,type:"activityCard"}),u(i,{path:"/pages/index/FirstActivity",tabbar:g.value},null,8,["tabbar"])])),_:1})}}};export{f as default};

unpackage/dist/build/web/assets/pages-index-FirstMerchant.CjLl1VMi.js → unpackage/dist/build/web/assets/pages-index-FirstMerchant.CnMhNL3T.js

@@ -1 +1 @@
-import{h as t,r as s,t as i,s as e,m as a,p as r,q as c,a as o,b as n,d as l,w as d,i as p,e as u,f as m}from"./index-DpMnyBR1.js";import{_ as v}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.DhN4GUsH.js";import x from"./pages-index-FirstList.GuCMWPf2.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.CabPTE2z.js";import"./s-search-block.CWo83Zjb.js";import"./s-empty.BAQ-uSii.js";/* empty css                                                                */import"./uni-load-more.BVYhhWsF.js";import"./youjiantou.DF0dutcV.js";const f={__name:"FirstMerchant",setup(f){t();const g=s({theme:"red",style:{bgType:"color",bgColor:"#ffffff",color:"#3c3c3c",activeColor:"#1fa380"},items:[{text:i("common.home"),url:"/pages/index/FirstIndex",iconUrl:e.$url.static("/static/firstIndex/index.svg"),activeIconUrl:e.$url.static("/static/firstIndex/index-active.svg")},{text:i("common.activities"),url:"/pages/index/FirstActivity",iconUrl:e.$url.static("/static/firstIndex/activity.svg"),activeIconUrl:e.$url.static("/static/firstIndex/activity-active.svg")},{text:i("common.videos"),url:"/pages/index/FirstVideo",iconUrl:e.$url.static("/static/firstIndex/video.svg"),activeIconUrl:e.$url.static("/static/firstIndex/video-active.svg")},{text:i("common.mall"),url:"/pages/index/index",iconUrl:e.$url.static("/static/firstIndex/shop.svg"),activeIconUrl:e.$url.static("/static/firstIndex/shop-active.svg")}]});return a((()=>{})),r((()=>{setTimeout((function(){c()}),800)})),(t,s)=>{const i=o(n("s-tabbar"),v),e=p;return u(),l(e,{class:"page-body",style:{background:"#f6f6f6"}},{default:d((()=>[m(x,{categoryId:12,type:"activityCard"}),m(i,{path:"/pages/index/FirstMerchant",tabbar:g.value},null,8,["tabbar"])])),_:1})}}};export{f as default};
+import{h as t,r as s,t as i,s as e,m as a,p as r,q as c,a as o,b as n,d as l,w as d,i as p,e as u,f as m}from"./index-B0rP7TUE.js";import{_ as v}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.Dl3MijRx.js";import x from"./pages-index-FirstList.CBMPMfHA.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.BwYsQMMS.js";import"./s-search-block.Bmr3VaeA.js";import"./s-empty.lLOx-jys.js";/* empty css                                                                */import"./uni-load-more.Cv9UFAnA.js";import"./youjiantou.DF0dutcV.js";const f={__name:"FirstMerchant",setup(f){t();const g=s({theme:"red",style:{bgType:"color",bgColor:"#ffffff",color:"#3c3c3c",activeColor:"#1fa380"},items:[{text:i("common.home"),url:"/pages/index/FirstIndex",iconUrl:e.$url.static("/static/firstIndex/index.svg"),activeIconUrl:e.$url.static("/static/firstIndex/index-active.svg")},{text:i("common.activities"),url:"/pages/index/FirstActivity",iconUrl:e.$url.static("/static/firstIndex/activity.svg"),activeIconUrl:e.$url.static("/static/firstIndex/activity-active.svg")},{text:i("common.videos"),url:"/pages/index/FirstVideo",iconUrl:e.$url.static("/static/firstIndex/video.svg"),activeIconUrl:e.$url.static("/static/firstIndex/video-active.svg")},{text:i("common.mall"),url:"/pages/index/index",iconUrl:e.$url.static("/static/firstIndex/shop.svg"),activeIconUrl:e.$url.static("/static/firstIndex/shop-active.svg")}]});return a((()=>{})),r((()=>{setTimeout((function(){c()}),800)})),(t,s)=>{const i=o(n("s-tabbar"),v),e=p;return u(),l(e,{class:"page-body",style:{background:"#f6f6f6"}},{default:d((()=>[m(x,{categoryId:12,type:"activityCard"}),m(i,{path:"/pages/index/FirstMerchant",tabbar:g.value},null,8,["tabbar"])])),_:1})}}};export{f as default};

unpackage/dist/build/web/assets/pages-index-FirstVideo.Dbs6E9Co.js → unpackage/dist/build/web/assets/pages-index-FirstVideo.u8n90qgz.js

@@ -1 +1 @@
-import{h as t,r as s,t as i,s as e,m as a,p as r,q as o,a as c,b as n,d as l,w as d,i as p,e as u,f as m}from"./index-DpMnyBR1.js";import{_ as v}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.DhN4GUsH.js";import x from"./pages-index-FirstList.GuCMWPf2.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.CabPTE2z.js";import"./s-search-block.CWo83Zjb.js";import"./s-empty.BAQ-uSii.js";/* empty css                                                                */import"./uni-load-more.BVYhhWsF.js";import"./youjiantou.DF0dutcV.js";const f={__name:"FirstVideo",setup(f){t();const g=s({theme:"red",style:{bgType:"color",bgColor:"#ffffff",color:"#3c3c3c",activeColor:"#1fa380"},items:[{text:i("common.home"),url:"/pages/index/FirstIndex",iconUrl:e.$url.static("/static/firstIndex/index.svg"),activeIconUrl:e.$url.static("/static/firstIndex/index-active.svg")},{text:i("common.activities"),url:"/pages/index/FirstActivity",iconUrl:e.$url.static("/static/firstIndex/activity.svg"),activeIconUrl:e.$url.static("/static/firstIndex/activity-active.svg")},{text:i("common.videos"),url:"/pages/index/FirstVideo",iconUrl:e.$url.static("/static/firstIndex/video.svg"),activeIconUrl:e.$url.static("/static/firstIndex/video-active.svg")},{text:i("common.mall"),url:"/pages/index/index",iconUrl:e.$url.static("/static/firstIndex/shop.svg"),activeIconUrl:e.$url.static("/static/firstIndex/shop-active.svg")}]});return a((()=>{})),r((()=>{setTimeout((function(){o()}),800)})),(t,s)=>{const i=c(n("s-tabbar"),v),e=p;return u(),l(e,{class:"page-body",style:{background:"#f6f6f6"}},{default:d((()=>[m(x,{categoryId:10,type:"articleCard"}),m(i,{path:"/pages/index/FirstVideo",tabbar:g.value},null,8,["tabbar"])])),_:1})}}};export{f as default};
+import{h as t,r as s,t as i,s as e,m as a,p as r,q as o,a as c,b as n,d as l,w as d,i as p,e as u,f as m}from"./index-B0rP7TUE.js";import{_ as v}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.Dl3MijRx.js";import x from"./pages-index-FirstList.CBMPMfHA.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.BwYsQMMS.js";import"./s-search-block.Bmr3VaeA.js";import"./s-empty.lLOx-jys.js";/* empty css                                                                */import"./uni-load-more.Cv9UFAnA.js";import"./youjiantou.DF0dutcV.js";const f={__name:"FirstVideo",setup(f){t();const g=s({theme:"red",style:{bgType:"color",bgColor:"#ffffff",color:"#3c3c3c",activeColor:"#1fa380"},items:[{text:i("common.home"),url:"/pages/index/FirstIndex",iconUrl:e.$url.static("/static/firstIndex/index.svg"),activeIconUrl:e.$url.static("/static/firstIndex/index-active.svg")},{text:i("common.activities"),url:"/pages/index/FirstActivity",iconUrl:e.$url.static("/static/firstIndex/activity.svg"),activeIconUrl:e.$url.static("/static/firstIndex/activity-active.svg")},{text:i("common.videos"),url:"/pages/index/FirstVideo",iconUrl:e.$url.static("/static/firstIndex/video.svg"),activeIconUrl:e.$url.static("/static/firstIndex/video-active.svg")},{text:i("common.mall"),url:"/pages/index/index",iconUrl:e.$url.static("/static/firstIndex/shop.svg"),activeIconUrl:e.$url.static("/static/firstIndex/shop-active.svg")}]});return a((()=>{})),r((()=>{setTimeout((function(){o()}),800)})),(t,s)=>{const i=c(n("s-tabbar"),v),e=p;return u(),l(e,{class:"page-body",style:{background:"#f6f6f6"}},{default:d((()=>[m(x,{categoryId:10,type:"articleCard"}),m(i,{path:"/pages/index/FirstVideo",tabbar:g.value},null,8,["tabbar"])])),_:1})}}};export{f as default};

unpackage/dist/build/web/assets/pages-order-aftersale-log.CTNJxYdr.js → unpackage/dist/build/web/assets/pages-order-aftersale-log.hikkaipo.js

@@ -1 +1 @@
-import{e,d as t,w as s,f as a,L as l,z as o,g as i,j as n,u as _,s as d,l as r,i as u,v as c,o as p,a as m,b as f,ap as y,x,y as g,F as j}from"./index-DpMnyBR1.js";import{_ as v}from"./s-layout.DHVePZJM.js";import{_ as b}from"./_plugin-vue_export-helper.BCo6x5W8.js";import"./s-menu-tools.eIZHonhR.js";import"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.DhN4GUsH.js";import"./uni-icons.CabPTE2z.js";import"./s-layout.vue_vue_type_style_index_0_scoped_05ef8b08_lang.DSLpRo7G.js";import"./phone-international-input.vue_vue_type_style_index_0_scoped_87b92f91_lang.IQ_VvQ9T.js";import"./s-search-block.CWo83Zjb.js";import"./phone-international-input.DWK6Kh5X.js";const h=b({__name:"log-item",props:{item:{type:Object,default(){}},index:{type:Number,default:0},data:{type:Object,default(){}}},setup:c=>(p,m)=>{const f=r,y=u;return e(),t(y,{class:"log-item ss-flex"},{default:s((()=>[a(y,{class:"log-icon ss-flex-col ss-col-center ss-m-r-20"},{default:s((()=>[a(f,{class:l(["cicon-title",0===c.index?"activity-color":""])},null,8,["class"]),c.data.length-1!==c.index?(e(),t(y,{key:0,class:"line"})):o("",!0)])),_:1}),a(y,null,{default:s((()=>[a(y,{class:"text"},{default:s((()=>[i(n(c.item.content),1)])),_:1}),a(y,{class:"date"},{default:s((()=>[i(n(_(d).$helper.timeFormat(c.item.createTime,"yyyy-mm-dd hh:MM:ss")),1)])),_:1})])),_:1})])),_:1})}},[["__scopeId","data-v-bc3922ca"]]),k=b({__name:"log",setup(l){const o=c({list:[]});return p((e=>{o.aftersaleId=e.id,async function(e){const{data:t}=await y.getAfterSaleLogList(e);o.list=t}(e.id)})),(l,i)=>{const n=u,_=m(f("s-layout"),v);return e(),t(_,{title:l.$t("order.after_sales_progress")},{default:s((()=>[a(n,{class:"log-box"},{default:s((()=>[(e(!0),x(j,null,g(o.list,((l,i)=>(e(),t(n,{key:l.id},{default:s((()=>[a(h,{item:l,index:i,data:o.list},null,8,["item","index","data"])])),_:2},1024)))),128))])),_:1})])),_:1},8,["title"])}}},[["__scopeId","data-v-d0623624"]]);export{k as default};
+import{e,d as t,w as s,f as a,L as l,z as o,g as i,j as n,u as _,s as d,l as r,i as u,v as c,o as p,a as m,b as f,ap as y,x,y as g,F as j}from"./index-B0rP7TUE.js";import{_ as v}from"./s-layout.CYiZkNSj.js";import{_ as b}from"./_plugin-vue_export-helper.BCo6x5W8.js";import"./s-menu-tools.rXM6y80q.js";import"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.Dl3MijRx.js";import"./uni-icons.BwYsQMMS.js";import"./s-layout.vue_vue_type_style_index_0_scoped_05ef8b08_lang.DelHuj4w.js";import"./phone-international-input.vue_vue_type_style_index_0_scoped_87b92f91_lang.Bfx2L-To.js";import"./s-search-block.Bmr3VaeA.js";import"./phone-international-input.BxUiipDV.js";const h=b({__name:"log-item",props:{item:{type:Object,default(){}},index:{type:Number,default:0},data:{type:Object,default(){}}},setup:c=>(p,m)=>{const f=r,y=u;return e(),t(y,{class:"log-item ss-flex"},{default:s((()=>[a(y,{class:"log-icon ss-flex-col ss-col-center ss-m-r-20"},{default:s((()=>[a(f,{class:l(["cicon-title",0===c.index?"activity-color":""])},null,8,["class"]),c.data.length-1!==c.index?(e(),t(y,{key:0,class:"line"})):o("",!0)])),_:1}),a(y,null,{default:s((()=>[a(y,{class:"text"},{default:s((()=>[i(n(c.item.content),1)])),_:1}),a(y,{class:"date"},{default:s((()=>[i(n(_(d).$helper.timeFormat(c.item.createTime,"yyyy-mm-dd hh:MM:ss")),1)])),_:1})])),_:1})])),_:1})}},[["__scopeId","data-v-bc3922ca"]]),k=b({__name:"log",setup(l){const o=c({list:[]});return p((e=>{o.aftersaleId=e.id,async function(e){const{data:t}=await y.getAfterSaleLogList(e);o.list=t}(e.id)})),(l,i)=>{const n=u,_=m(f("s-layout"),v);return e(),t(_,{title:l.$t("order.after_sales_progress")},{default:s((()=>[a(n,{class:"log-box"},{default:s((()=>[(e(!0),x(j,null,g(o.list,((l,i)=>(e(),t(n,{key:l.id},{default:s((()=>[a(h,{item:l,index:i,data:o.list},null,8,["item","index","data"])])),_:2},1024)))),128))])),_:1})])),_:1},8,["title"])}}},[["__scopeId","data-v-d0623624"]]);export{k as default};

unpackage/dist/build/web/assets/pages-public-error.BdYiOfO4.js → unpackage/dist/build/web/assets/pages-public-error.CKylo3Oc.js

@@ -1 +1 @@
-import{r as t,o as e,a as o,b as n,d as a,w as r,i as s,e as i,z as c,bo as p,c5 as l}from"./index-DpMnyBR1.js";import{_ as u}from"./s-empty.BAQ-uSii.js";import{_}from"./_plugin-vue_export-helper.BCo6x5W8.js";/* empty css                                                                */const m=_({__name:"error",setup(_){const m=t(""),x=t("");async function d(){p({url:"/pages/index/index"}),await l()}return e((t=>{m.value=t.errCode,x.value=t.errMsg})),(t,e)=>{const p=o(n("s-empty"),u),l=s;return i(),a(l,{class:"error-page"},{default:r((()=>["NetworkError"===m.value?(i(),a(p,{key:0,icon:"/static/internet-empty.png",text:"网络连接失败",showAction:"",actionText:"重新连接",onClickAction:d,buttonColor:"#132b85"})):"TemplateError"===m.value?(i(),a(p,{key:1,icon:"/static/internet-empty.png",text:"未找到模板",showAction:"",actionText:"重新加载",onClickAction:d,buttonColor:"#132b85"})):""!==m.value?(i(),a(p,{key:2,icon:"/static/internet-empty.png",text:x.value,showAction:"",actionText:"重新加载",onClickAction:d,buttonColor:"#132b85"},null,8,["text"])):c("",!0)])),_:1})}}},[["__scopeId","data-v-e358358a"]]);export{m as default};
+import{r as t,o as e,a as o,b as n,d as a,w as r,i as s,e as i,z as c,bo as p,c5 as l}from"./index-B0rP7TUE.js";import{_ as u}from"./s-empty.lLOx-jys.js";import{_}from"./_plugin-vue_export-helper.BCo6x5W8.js";/* empty css                                                                */const m=_({__name:"error",setup(_){const m=t(""),x=t("");async function d(){p({url:"/pages/index/index"}),await l()}return e((t=>{m.value=t.errCode,x.value=t.errMsg})),(t,e)=>{const p=o(n("s-empty"),u),l=s;return i(),a(l,{class:"error-page"},{default:r((()=>["NetworkError"===m.value?(i(),a(p,{key:0,icon:"/static/internet-empty.png",text:"网络连接失败",showAction:"",actionText:"重新连接",onClickAction:d,buttonColor:"#132b85"})):"TemplateError"===m.value?(i(),a(p,{key:1,icon:"/static/internet-empty.png",text:"未找到模板",showAction:"",actionText:"重新加载",onClickAction:d,buttonColor:"#132b85"})):""!==m.value?(i(),a(p,{key:2,icon:"/static/internet-empty.png",text:x.value,showAction:"",actionText:"重新加载",onClickAction:d,buttonColor:"#132b85"},null,8,["text"])):c("",!0)])),_:1})}}},[["__scopeId","data-v-e358358a"]]);export{m as default};

unpackage/dist/build/web/assets/pages-public-richtext.Chn5KPBk.js → unpackage/dist/build/web/assets/pages-public-richtext.B5cwjZfq.js

@@ -1 +1 @@
-import{v as t,o as e,a$ as s,a as l,b as i,d as o,w as n,A as a,e as _,f as p,i as c}from"./index-DpMnyBR1.js";import{_ as r}from"./mp-html.AaSYH2eg.js";import{_ as u}from"./s-layout.DHVePZJM.js";/* empty css                                                                 */import{_ as m}from"./_plugin-vue_export-helper.BCo6x5W8.js";import"./mp-html.vue_vue_type_style_index_0_scoped_b0aa647f_lang.JG3Tl4Q5.js";import"./s-menu-tools.eIZHonhR.js";import"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.DhN4GUsH.js";import"./uni-icons.CabPTE2z.js";import"./s-layout.vue_vue_type_style_index_0_scoped_05ef8b08_lang.DSLpRo7G.js";import"./phone-international-input.vue_vue_type_style_index_0_scoped_87b92f91_lang.IQ_VvQ9T.js";import"./s-search-block.CWo83Zjb.js";import"./phone-international-input.DWK6Kh5X.js";const d=m({__name:"richtext",props:{title:{defautls:"",type:String},type:{defautls:"",type:String}},setup(m){const d=t({title:"",content:""});const y=m;return e((t=>{(t.title||y.title)&&(d.title=t.title||y.title,s({title:d.title||y.title})),async function(t,e){console.log(t,e);const{code:l,data:i}=await a.getArticle(t,e);0===l&&(d.content=i.content,d.title!==i.title&&(d.title=i.title,s({title:d.title})))}(t.id,t.title||y.title)})),(t,e)=>{const s=l(i("mp-html"),r),a=c,y=l(i("s-layout"),u);return d.title&&!m.type?(_(),o(y,{key:0,class:"set-wrap",title:d.title,bgStyle:{color:"#FFF"}},{default:n((()=>[p(a,{class:"ss-p-30"},{default:n((()=>[p(s,{class:"richtext",content:d.content},null,8,["content"])])),_:1})])),_:1},8,["title"])):(_(),o(s,{key:1,class:"richtext",content:d.content},null,8,["content"]))}}},[["__scopeId","data-v-5927adcf"]]);export{d as default};
+import{v as t,o as e,a$ as s,a as l,b as i,d as o,w as n,A as a,e as _,f as p,i as c}from"./index-B0rP7TUE.js";import{_ as r}from"./mp-html.BMZorlyt.js";import{_ as u}from"./s-layout.CYiZkNSj.js";/* empty css                                                                 */import{_ as m}from"./_plugin-vue_export-helper.BCo6x5W8.js";import"./mp-html.vue_vue_type_style_index_0_scoped_b0aa647f_lang.DbgvY4Ls.js";import"./s-menu-tools.rXM6y80q.js";import"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.Dl3MijRx.js";import"./uni-icons.BwYsQMMS.js";import"./s-layout.vue_vue_type_style_index_0_scoped_05ef8b08_lang.DelHuj4w.js";import"./phone-international-input.vue_vue_type_style_index_0_scoped_87b92f91_lang.Bfx2L-To.js";import"./s-search-block.Bmr3VaeA.js";import"./phone-international-input.BxUiipDV.js";const d=m({__name:"richtext",props:{title:{defautls:"",type:String},type:{defautls:"",type:String}},setup(m){const d=t({title:"",content:""});const y=m;return e((t=>{(t.title||y.title)&&(d.title=t.title||y.title,s({title:d.title||y.title})),async function(t,e){console.log(t,e);const{code:l,data:i}=await a.getArticle(t,e);0===l&&(d.content=i.content,d.title!==i.title&&(d.title=i.title,s({title:d.title})))}(t.id,t.title||y.title)})),(t,e)=>{const s=l(i("mp-html"),r),a=c,y=l(i("s-layout"),u);return d.title&&!m.type?(_(),o(y,{key:0,class:"set-wrap",title:d.title,bgStyle:{color:"#FFF"}},{default:n((()=>[p(a,{class:"ss-p-30"},{default:n((()=>[p(s,{class:"richtext",content:d.content},null,8,["content"])])),_:1})])),_:1},8,["title"])):(_(),o(s,{key:1,class:"richtext",content:d.content},null,8,["content"]))}}},[["__scopeId","data-v-5927adcf"]]);export{d as default};

unpackage/dist/build/web/assets/pages-public-webview._nXw1dUm.js → unpackage/dist/build/web/assets/pages-public-webview.CTgLk1DX.js

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