update:1.更新注册的时候可输入邀请码进行绑定

locale/en.json

@@ -302,7 +302,9 @@
 		"select_account_login": "Select Account Login",
 		"wechat_no_bind": "This WeChat is not linked to any account, please use another login method",
 		"wechat_register": "WeChat Register",
-		"wechat_no_account": "Your WeChat has no account, please register via sharing"
+		"wechat_no_account": "Your WeChat has no account, please register via sharing",
+		"link_id": "Invitation Code",
+		"enter_link_id": "Please enter the invitation code (optional)"
 	},
 	"review": {
 		"all_reviews": "All Reviews",

locale/zh-Hans.json

@@ -303,7 +303,9 @@
 		"select_account_login": "请选择账号登录",
 		"wechat_no_bind": "该微信暂绑定无账号,请使用其他登陆方式",
 		"wechat_register": "微信注册",
-		"wechat_no_account": "您的微信没有账号，请先注册"
+		"wechat_no_account": "您的微信没有账号，请先注册",
+		"link_id": "邀请码",
+		"enter_link_id": "请输入邀请码(选填)"
 	},
 	// 评论
 	"review": {

pages/index/login.vue

@@ -60,6 +60,10 @@
 						maxlength="4">
 					</uni-easyinput>
 				</uni-forms-item>
+				<uni-forms-item name="linkId" :label="t('account.link_id')" class="loginUniFormItem" v-if="!hasStorageLinkId">
+					<uni-easyinput :placeholder="t('account.enter_link_id')" v-model="state.registerReqVO.linkId" :inputBorder="false" type="input">
+					</uni-easyinput>
+				</uni-forms-item>
 			</uni-forms>
 			<view
 				style="display: flex;justify-content: space-between;padding: 40rpx;padding-bottom: 0rpx;padding-bottom: 40rpx">
@@ -94,6 +98,8 @@
 	import AuthUtil from '@/sheep/api/member/auth';
 	import phoneInternationalInput from '@/sheep/components/s-auth-modal/components/phone-international-input.vue';
 	import { t } from '@/locale'
+	const hasStorageLinkId = ref(!!uni.getStorageSync("linkId"))
+
 	const mobileInput = (mobile,mobileError)=>{
 		state.model.mobile = mobile;
 		state.mobileErrorMsg = mobileError;
@@ -111,6 +117,7 @@
 			code: "",
 			state: "",
 			username: "",
+			linkId: uni.getStorageSync("linkId") || undefined,
 		},
 		isMobileEnd: false, // 手机号输入完毕
 		codeText: '获取验证码',
@@ -195,12 +202,12 @@
 	// 直接点微信注册，或者点微信登录，但没账号的都提示注册
 	async function officialRegister() {
 		// 没有linkId 不给注册
-		const linkId = uni.getStorageSync("linkId");
+		// const linkId = uni.getStorageSync("linkId");
 		// if (!linkId) {
 		// 	sheep.$helper.toast(t('account.register_by_sharing_only'));
 		// 	return false;
 		// }
-		state.registerReqVO.linkId = linkId
+		// state.registerReqVO.linkId = linkId
 		const {
 			code
 		} = await AuthUtil.OfficialEnterLogin(state.model, state.registerReqVO);

pages/public/setting.vue

@@ -16,7 +16,7 @@
             })
           " />
 				<!-- 为了过审 只有 iOS-App 有注销账号功能 -->
-				<uni-list-item v-if="isLogin && sheep.$platform.os === 'ios' && sheep.$platform.name === 'App'"
+				<uni-list-item
 					:title="t('common.logout_account')" rightText="" showArrow clickable :border="false" class="list-border"
 					@click="onLogoff" />
 			</uni-list>
@@ -89,7 +89,7 @@
 				}
 				const {
 					code
-				} = await AuthUtil.logout();
+				} = await AuthUtil.deleteUser();
 				if (code !== 0) {
 					return;
 				}

pages/shop/index.vue

@@ -22,6 +22,7 @@
 	} from 'vue';
 	import {
 		onLoad,
+		onShow,
 		onPageScroll,
 		onPullDownRefresh
 	} from '@dcloudio/uni-app';
@@ -104,6 +105,7 @@
 		    item.url = `${item.url}?shopId=${state.shopId}&shopName=${encodeURIComponent(state.shopName)}&merchantId=${state.merchantId}`;
 		    return item;
 		});
+		console.log(options)
 		const { code,data } = await PageApi.getPage({shopId:options.shopId,merchantId:options.merchantId});
 		console.log(data)
 		template.value = data.property

pages/user/qrcode-share.vue

@@ -67,6 +67,7 @@
 			"desc": "",
 			"image": "",
 			"path": "",
+			"linkId": state.linkId,
 			"link": import.meta.env.SHOPRO_BASE_URL+"/#/pages/index/user?linkId="+state.linkId,
 			"poster": {
 				"type": "user"

sheep/api/member/auth.js

@@ -130,6 +130,13 @@ const AuthUtil = {
 			method: 'POST',
 		});
 	},
+	// 登出系统
+	deleteUser: () => {
+		return request({
+			url: '/member/auth/deleteUser',
+			method: 'POST',
+		});
+	},
 	// 刷新令牌
 	refreshToken: (refreshToken) => {
 		return request({

sheep/components/s-auth-modal/components/register.vue

@@ -27,6 +27,10 @@
 					maxlength="4">
 				</uni-easyinput>
 			</uni-forms-item>
+			<uni-forms-item name="linkId" :label="t('account.link_id')" class="loginUniFormItem" v-if="!hasStorageLinkId">
+				<uni-easyinput :placeholder="t('account.enter_link_id')" v-model="state.model.linkId" :inputBorder="false" type="input">
+				</uni-easyinput>
+			</uni-forms-item>
 		</uni-forms>
 		<view style="display: flex;justify-content: space-between;margin-top: 20rpx;">
 			<!-- <button class="ss-reset-button forgot-btn" @tap="showAuthModal('resetPassword')">
@@ -60,6 +64,8 @@
 	import AuthUtil from '@/sheep/api/member/auth';
 	import phoneInternationalInput from './phone-international-input.vue';
 	import { t } from '@/locale'
+	const hasStorageLinkId = ref(!!uni.getStorageSync("linkId"))
+
  	const mobileInput = (mobile,mobileError)=>{
 		// console.log(mobile,mobileError);
 		state.model.mobile = mobile;
@@ -76,6 +82,7 @@
 			password:'', // 密码
 			mobile: '', // 手机号
 			code: '', // 验证码
+			linkId: uni.getStorageSync("linkId") || '', // 邀请码
 		},
 		rules: {
 			username,
@@ -132,10 +139,10 @@
 		}
 		
 		// 看缓存中有没有linkId 如果有的话 加入model传给后台 即为绑定
-		const linkId = uni.getStorageSync("linkId")
-		if (linkId) {
-			state.model.linkId = linkId
-		}
+		// const linkId = uni.getStorageSync("linkId")
+		// if (linkId) {
+		// 	state.model.linkId = linkId
+		// }
 		// else{
 		// 	sheep.$helper.toast('您只能通过分享注册');
 		// 	return false;
@@ -182,13 +189,14 @@
 
 	.loginUniForm {
 		border: 1rpx solid #d6d6d6;
-		padding: 10rpx 15rpx;
+		padding: 0 15rpx;
 		border-radius: 10rpx;
 	}
 
 	.loginUniFormItem {
 		border-bottom: 1rpx solid #d6d6d6;
-		padding-bottom: 10rpx;
+		// padding-bottom: 10rpx;
+		padding: 10rpx 0;
 	}
 
 	.loginUniFormItem:last-child {

sheep/components/s-follow-modal/s-follow-modal.vue

@@ -1,6 +1,6 @@
 <template>
 	<!-- 关注 -->
-	<su-popup :show="show" round="10" @close="closeSubscribeModal">
+	<su-popup :show="show && !Android" round="10" @close="closeSubscribeModal">
 		<view class="login-wrap">
 			<view class="head-box">
 				<view class=" ss-m-b-20">
@@ -38,6 +38,8 @@
 		
 	} from '@/sheep/hooks/useModal';
 	import { t } from '@/locale'
+	import { isAndroid } from '@/sheep/hooks/useApp';
+	const Android = isAndroid();
 	const show = computed(() => sheep.$store('modal').subscribe);
 	
 	// 创建一个响应式的图像路径变量

sheep/components/s-share-modal/canvas-poster/poster/user.js

@@ -22,6 +22,7 @@ async function getImagePath(imagePath) {
   });
 }
 const user = async (poster) => {
+  console.log("poster", poster)
   const width = poster.width;
   const userInfo = sheep.$store('user').userInfo;
   
@@ -45,6 +46,21 @@ const user = async (poster) => {
           },
         },
       },
+      {
+        name: 'linkId',
+        type: 'text',
+        val: "邀请码:" + poster.shareInfo.linkId,
+        x: width / 2,
+        y: width * 0.65,
+        paintbrushProps: {
+          textAlign: 'center',
+          fillStyle: '#333',
+          font: {
+            fontSize: 20,
+            fontFamily: 'sans-serif',
+          },
+        },
+      },
       {
         name: 'avatar',
         type: 'image',

sheep/components/s-wallet-card/s-wallet-card.vue

@@ -1,16 +1,15 @@
 <!-- 装修用户组件：用户资产 -->
 <template>
 	<view>
-		<view class="progress-box" @tap="state.showProtocol = true">
+		<!-- <view class="progress-box" @tap="state.showProtocol = true">
 			<view class="progress-container">
 				<view class="progress-bar" :style="{ width: progressWidth }">
 				</view>
 				<view class="progress-text">
 					{{userWallet.socialStatusLevel || $t('common.no_level')}}
 				</view>
-
 			</view>
-		</view>
+		</view> -->
 		<!-- <view class="ss-wallet-menu-wrap ss-flex ss-col-center">
 			<view class="menu-item ss-flex-1 ss-flex-col  ss-col-center">
 				<view class="value-box ">

sheep/hooks/useModal.js

@@ -22,7 +22,8 @@ async function onSign() {
 		data
 	} = await SignInApi.createSignInRecord();
 	if (code === 0) {
-		showSignUpModal(data)
+		//暂时不弹出自动签到弹窗
+		// showSignUpModal(data)
 	}
 	if (timer) {
 		clearInterval(timer);

sheep/platform/share.js

@@ -42,7 +42,7 @@ const getShareInfo = (
 	// 自动拼接分享用户参数
 	const query = buildSpmQuery(scene.params);
 	shareInfo.query = query;
-
+	
 	// 配置分享链接地址
 	shareInfo.link = buildSpmLink(query, shareConfig.linkAddress);
 	// console.log("share.js link", shareInfo.link)

sheep/store/user.js

@@ -122,7 +122,7 @@ const user = defineStore({
 			if(android.value){
 				// 如果后台没返回或者返回来的跟从webview中传来的不一致，拿最新的webview中的拿
 				if(!data.androidRegisterId || data.androidRegisterId !== androidJiGuangId.value){
-					await UserApi.updateAndroidJiGuangId(androidJiGuangId.value)
+					await UserApi.updateAndroidJiGuangId(androidJiGuangId.value || '')
 				}
 			}
 			this.userWallet = data;

uni_modules/mp-html/components/mp-html/node/node.vue

@@ -224,9 +224,10 @@ export default {
     imgTap (e) {
 		
       const node = this.childs[e.currentTarget.dataset.i]
-	  const cleanUrl = node.attrs['data-href'].replace(/&/g, '&');
-	  console.log(node.attrs.src);
-	  console.log(cleanUrl)
+      const cleanUrl = node.attrs['data-href'].replace(/&/g, '&');
+      // console.log(node.attrs.src);
+      // console.log(cleanUrl)
+      // return
       if(node.attrs.src != node.attrs['data-href']){
         uni.navigateTo({
           url: cleanUrl,
@@ -238,7 +239,31 @@ export default {
                 // 如果是外部链接,可以使用系统浏览器打开
                 if(cleanUrl.includes('http')) {
                   // #ifdef H5
-                  location.href = cleanUrl
+                  // 处理内部页面链接
+                  if(cleanUrl.includes('/pages/')) {
+                    // 提取实际的路由路径和参数
+                    const hashIndex = cleanUrl.indexOf('#')
+                    if(hashIndex !== -1) {
+                      const route = cleanUrl.substring(hashIndex + 1) // 获取 # 后面的部分
+                      uni.navigateTo({
+                        url: route,
+                        fail() {
+                          uni.switchTab({
+                            url: route,
+                            fail() {
+                              // 如果都失败了，保底使用 window.location.href
+                              window.location.href = cleanUrl
+                            }
+                          })
+                        }
+                      })
+                    } else {
+                      window.location.href = cleanUrl
+                    }
+                  } else {
+                    // 外部链接直接使用 window.location.href
+                    window.location.href = cleanUrl
+                  }
                   // #endif
                   // #ifdef APP-PLUS
                   plus.runtime.openWeb(cleanUrl)

unpackage/dist/build/web/assets/comment-item.Bu4vye2I.js → unpackage/dist/build/web/assets/comment-item.Cy-5rcXv.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,I as f}from"./index-CIHXBJK6.js";import{_}from"./uni-rate.uhGiBwWQ.js";import{_ as y}from"./su-image.CGnE1Zeu.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,I as f}from"./index-BMyxVMbF.js";import{_}from"./uni-rate._5C-dHGH.js";import{_ as y}from"./su-image.Ntqa4ut8.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/const.DorE3lq_.js → unpackage/dist/build/web/assets/const.C5lasz75.js

@@ -1 +1 @@
-import{bm as e}from"./index-CIHXBJK6.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{bm as e}from"./index-BMyxVMbF.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.D4GwW05y.js → unpackage/dist/build/web/assets/pages-index-FirstActivity.DpUeYiRA.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-CIHXBJK6.js";import{_ as m}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.XupmRtHT.js";import x from"./pages-index-FirstList.B0qD93gT.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.Dn5XuiUW.js";import"./s-search-block.Bj2KQbpW.js";import"./s-empty.DFelyBfT.js";/* empty css                                                                */import"./uni-load-more.DLKkFol3.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-BMyxVMbF.js";import{_ as m}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.uDphw_n5.js";import x from"./pages-index-FirstList.BCMY9ePF.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.DIbeqKDq.js";import"./s-search-block._qoMdfrT.js";import"./s-empty.D8Sat5wX.js";/* empty css                                                                */import"./uni-load-more.DdHp2CCp.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.CF2duPFk.js → unpackage/dist/build/web/assets/pages-index-FirstMerchant.C4mtVZXZ.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-CIHXBJK6.js";import{_ as v}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.XupmRtHT.js";import x from"./pages-index-FirstList.B0qD93gT.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.Dn5XuiUW.js";import"./s-search-block.Bj2KQbpW.js";import"./s-empty.DFelyBfT.js";/* empty css                                                                */import"./uni-load-more.DLKkFol3.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-BMyxVMbF.js";import{_ as v}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.uDphw_n5.js";import x from"./pages-index-FirstList.BCMY9ePF.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.DIbeqKDq.js";import"./s-search-block._qoMdfrT.js";import"./s-empty.D8Sat5wX.js";/* empty css                                                                */import"./uni-load-more.DdHp2CCp.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.Dq_Sx41Z.js → unpackage/dist/build/web/assets/pages-index-FirstVideo.BM5KXSCU.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-CIHXBJK6.js";import{_ as v}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.XupmRtHT.js";import x from"./pages-index-FirstList.B0qD93gT.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.Dn5XuiUW.js";import"./s-search-block.Bj2KQbpW.js";import"./s-empty.DFelyBfT.js";/* empty css                                                                */import"./uni-load-more.DLKkFol3.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-BMyxVMbF.js";import{_ as v}from"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.uDphw_n5.js";import x from"./pages-index-FirstList.BCMY9ePF.js";import"./_plugin-vue_export-helper.BCo6x5W8.js";import"./uni-icons.DIbeqKDq.js";import"./s-search-block._qoMdfrT.js";import"./s-empty.D8Sat5wX.js";/* empty css                                                                */import"./uni-load-more.DdHp2CCp.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.Z3BaggCh.js → unpackage/dist/build/web/assets/pages-order-aftersale-log.DsrYtgr4.js

@@ -1 +1 @@
-import{e,d as t,w as s,f as a,J 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,am as y,x,y as g,F as j}from"./index-CIHXBJK6.js";import{_ as v}from"./s-layout.DsRVkhyD.js";import{_ as h}from"./_plugin-vue_export-helper.BCo6x5W8.js";import"./s-menu-tools.Di3ooeY2.js";import"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.XupmRtHT.js";import"./uni-icons.Dn5XuiUW.js";import"./s-layout.vue_vue_type_style_index_0_scoped_d5f7c468_lang.X__YG5gI.js";import"./phone-international-input.vue_vue_type_style_index_0_scoped_a793e264_lang._Ymtd1hH.js";import"./s-search-block.Bj2KQbpW.js";import"./useGoods.BMh-0Uau.js";import"./phone-international-input.11CX4hdU.js";const b=h({__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=h({__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(b,{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,J 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,am as y,x,y as g,F as j}from"./index-BMyxVMbF.js";import{_ as v}from"./s-layout.CpS5AI4B.js";import{_ as h}from"./_plugin-vue_export-helper.BCo6x5W8.js";import"./s-menu-tools.BS-sy7yW.js";import"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.uDphw_n5.js";import"./uni-icons.DIbeqKDq.js";import"./s-layout.vue_vue_type_style_index_0_scoped_d5f7c468_lang.W0aeD08g.js";import"./phone-international-input.vue_vue_type_style_index_0_scoped_a793e264_lang.CcjAPXa7.js";import"./s-search-block._qoMdfrT.js";import"./useGoods.BVTCuxZo.js";import"./phone-international-input.DwHEWXPw.js";const b=h({__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=h({__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(b,{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.BUc5nbGi.js → unpackage/dist/build/web/assets/pages-public-error.DqTNk6S6.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,bj as p,c0 as l}from"./index-CIHXBJK6.js";import{_ as u}from"./s-empty.DFelyBfT.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,bj as p,c0 as l}from"./index-BMyxVMbF.js";import{_ as u}from"./s-empty.D8Sat5wX.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.NJsQ6uYq.js → unpackage/dist/build/web/assets/pages-public-richtext.Cwh84fSA.js

@@ -1 +1 @@
-import{v as t,o as e,aY as s,a as l,b as o,d as i,w as n,A as a,e as _,f as p,i as c}from"./index-CIHXBJK6.js";import{_ as r}from"./mp-html.Dh3HalNR.js";import{_ as u}from"./s-layout.DsRVkhyD.js";/* empty css                                                                 */import{_ as d}from"./_plugin-vue_export-helper.BCo6x5W8.js";import"./mp-html.vue_vue_type_style_index_0_scoped_b0aa647f_lang.C7UfEBIv.js";import"./s-menu-tools.Di3ooeY2.js";import"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.XupmRtHT.js";import"./uni-icons.Dn5XuiUW.js";import"./s-layout.vue_vue_type_style_index_0_scoped_d5f7c468_lang.X__YG5gI.js";import"./phone-international-input.vue_vue_type_style_index_0_scoped_a793e264_lang._Ymtd1hH.js";import"./s-search-block.Bj2KQbpW.js";import"./useGoods.BMh-0Uau.js";import"./phone-international-input.11CX4hdU.js";const m=d({__name:"richtext",props:{title:{defautls:"",type:String},type:{defautls:"",type:String}},setup(d){const m=t({title:"",content:""});const y=d;return e((t=>{(t.title||y.title)&&(m.title=t.title||y.title,s({title:m.title||y.title})),async function(t,e){console.log(t,e);const{code:l,data:o}=await a.getArticle(t,e);0===l&&(m.content=o.content,m.title!==o.title&&(m.title=o.title,s({title:m.title})))}(t.id,t.title||y.title)})),(t,e)=>{const s=l(o("mp-html"),r),a=c,y=l(o("s-layout"),u);return m.title&&!d.type?(_(),i(y,{key:0,class:"set-wrap",title:m.title,bgStyle:{color:"#FFF"}},{default:n((()=>[p(a,{class:"ss-p-30"},{default:n((()=>[p(s,{class:"richtext",content:m.content},null,8,["content"])])),_:1})])),_:1},8,["title"])):(_(),i(s,{key:1,class:"richtext",content:m.content},null,8,["content"]))}}},[["__scopeId","data-v-5927adcf"]]);export{m as default};
+import{v as t,o as e,aY as s,a as l,b as o,d as i,w as n,A as a,e as _,f as p,i as c}from"./index-BMyxVMbF.js";import{_ as r}from"./mp-html.B3S_vHae.js";import{_ as u}from"./s-layout.CpS5AI4B.js";/* empty css                                                                 */import{_ as d}from"./_plugin-vue_export-helper.BCo6x5W8.js";import"./mp-html.vue_vue_type_style_index_0_scoped_b0aa647f_lang.BqLkAD2k.js";import"./s-menu-tools.BS-sy7yW.js";import"./s-search-block.vue_vue_type_style_index_0_scoped_f692e81a_lang.uDphw_n5.js";import"./uni-icons.DIbeqKDq.js";import"./s-layout.vue_vue_type_style_index_0_scoped_d5f7c468_lang.W0aeD08g.js";import"./phone-international-input.vue_vue_type_style_index_0_scoped_a793e264_lang.CcjAPXa7.js";import"./s-search-block._qoMdfrT.js";import"./useGoods.BVTCuxZo.js";import"./phone-international-input.DwHEWXPw.js";const m=d({__name:"richtext",props:{title:{defautls:"",type:String},type:{defautls:"",type:String}},setup(d){const m=t({title:"",content:""});const y=d;return e((t=>{(t.title||y.title)&&(m.title=t.title||y.title,s({title:m.title||y.title})),async function(t,e){console.log(t,e);const{code:l,data:o}=await a.getArticle(t,e);0===l&&(m.content=o.content,m.title!==o.title&&(m.title=o.title,s({title:m.title})))}(t.id,t.title||y.title)})),(t,e)=>{const s=l(o("mp-html"),r),a=c,y=l(o("s-layout"),u);return m.title&&!d.type?(_(),i(y,{key:0,class:"set-wrap",title:m.title,bgStyle:{color:"#FFF"}},{default:n((()=>[p(a,{class:"ss-p-30"},{default:n((()=>[p(s,{class:"richtext",content:m.content},null,8,["content"])])),_:1})])),_:1},8,["title"])):(_(),i(s,{key:1,class:"richtext",content:m.content},null,8,["content"]))}}},[["__scopeId","data-v-5927adcf"]]);export{m as default};

unpackage/dist/build/web/assets/pages-public-webview.8DaDCpTI.js → unpackage/dist/build/web/assets/pages-public-webview.DbVHJu4D.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,c1 as u}from"./index-CIHXBJK6.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,c1 as u}from"./index-BMyxVMbF.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};