Merge branch 'dev' into 'master'

uniapp【修复】：修复安卓版本未登陆情况下，登录页无法二次跳转

See merge request jianweie/coreshoppro!122

CoreCms.Net.Uni-App/CoreShop/config/env.js

@@ -1,16 +1,16 @@
 // 不同的环境变量配置
-const development = {
+const development = { 
-	requestBaseUrl: 'https://api.test.pro.coreshop.cn',
+	requestBaseUrl: 'https://api.pro.demo.coreshop.cn', 
 	appid: '',
 }
 
-const test = {
+const test = { 
-	requestBaseUrl: 'https://api.test.pro.coreshop.cn',
+	requestBaseUrl: 'https://api.pro.demo.coreshop.cn', 
 	appid: '',
 }
 
-const production = {
+const production = { 
-	requestBaseUrl: 'https://api.test.pro.coreshop.cn',
+	requestBaseUrl: 'https://api.pro.demo.coreshop.cn', 
 	appid: '',
 }
 

CoreCms.Net.Uni-App/CoreShop/core/models/config.ts

@@ -16,7 +16,8 @@ export interface ShopConfigType {
 	indexPopupWindowImageUrl ?: string;
 	invoiceSwitch ?: number;
 	isAllowUserSecondBind ?: number;
-	
+    orderAutoSignTime ?: number;
+    orderAutoEvalTime ?: number;
 	/** 余额提现 */
 	isAllowWithdrawCash ?: number;
 	isOpenAgent ?: number;

CoreCms.Net.Uni-App/CoreShop/core/store/login.ts

@@ -1,38 +1,45 @@
 import { defineStore } from 'pinia';
 import { UserToken } from '@/core/consts';
-import { handleShowToast } from '@/core/utils';
+import { handleShowToast, handleRouteNavigateTo } from '@/core/utils';
 import { queryUserInfo } from '@/core/api';
 import type { UserLoginStoreType, Response, UserInfoType } from '@/core/models';
 import { useUserInfoStore } from './userInfo';
 
 export const useLoginStore = defineStore('useLoginStore', {
-	state: () : UserLoginStoreType => {
+    state: () : UserLoginStoreType => {
-		return {
+        return {
-			showLoginModalTogglePop: false
+            showLoginModalTogglePop: false
-		};
+        };
-	},
+    },
-	actions: {
+    actions: {
-		/** 检查是否登录 */
+        /** 检查是否登录 */
-		checkLogin(callBack : () => void) {
+        checkLogin(callBack : () => void) {
-			if (!uni.getStorageSync(UserToken)) {
+            if (!uni.getStorageSync(UserToken)) {
-				this.setShowLoginModalTogglePop(true);
+                // #ifdef MP-ALIPAY || MP-WEIXIN
-			} else {
+                this.setShowLoginModalTogglePop(true);
-				callBack();
+                // #endif
-			}
+
-		},
+                // #ifndef MP-WEIXIN || MP-ALIPAY 
-		/** 获取用户数据 */
+                handleRouteNavigateTo(`/pages/login/login?backUrl=${'/pages/member/member'}`)
-		async getUserInfo() {
+                // #endif
-			const userInfoStore = useUserInfoStore();
+
-			const userInfo : Response<UserInfoType> = await queryUserInfo();
+            } else {
-			if (userInfo.status) {
+                callBack();
-				userInfoStore.setUserInfo(userInfo?.data);
+            }
-			} else {
+        },
-				handleShowToast(userInfo.msg)
+        /** 获取用户数据 */
-			}
+        async getUserInfo() {
-		},
+            const userInfoStore = useUserInfoStore();
-		/** 设置登录弹框打开或者关闭 */
+            const userInfo : Response<UserInfoType> = await queryUserInfo();
-		setShowLoginModalTogglePop(showLoginModalTogglePop : boolean) {
+            if (userInfo.status) {
-			this.showLoginModalTogglePop = showLoginModalTogglePop;
+                userInfoStore.setUserInfo(userInfo?.data);
-		},
+            } else {
-	},
+                handleShowToast(userInfo.msg)
+            }
+        },
+        /** 设置登录弹框打开或者关闭 */
+        setShowLoginModalTogglePop(showLoginModalTogglePop : boolean) {
+            this.showLoginModalTogglePop = showLoginModalTogglePop;
+        },
+    },
 });

CoreCms.Net.Uni-App/CoreShop/manifest.json

@@ -50,7 +50,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx3f290252193d7627",
+        "appid" : "wx6a73f5a508da7af2",
         "setting" : {
             "urlCheck" : false,
             "checkSiteMap" : false,

CoreCms.Net.Uni-App/CoreShop/pages/order/result/result.vue

@@ -114,7 +114,7 @@
 		if (state.orderId && isGoodsOrder()) {
 			handleRouteRedirectTo(`/pages/subpackage/member/order/detail/detail?orderId=${state.orderId}`);
 		} else if (state.paymentInfo.type === PaymentTypeEnum.recharge) {
-			handleRouteRedirectTo(`/pages/subpackage/member/balance/detail/detail`);
+			handleRouteRedirectTo(`/pages/subpackage/member/balance/balance-detail/index`);
 		} else if (state.paymentInfo.type === PaymentTypeEnum.formPay || state.paymentInfo.type === PaymentTypeEnum.formOrder) {
 			handleRouteSwitchTab()
 		} else if (state.paymentInfo.type === PaymentTypeEnum.serviceOrder) {

CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/detail/detail.vue

@@ -27,7 +27,7 @@
                     </view>
                     <view class="explain">
                         <view class="tit">务必在收到商品后再确认收货。</view>
-                        <view class="desc">发货20天后将自动确认收货</view>
+                        <view class="desc">发货{{shopConfigStore?.config?.orderAutoSignTime}}天后将自动确认收货</view>
                     </view>
                 </view>
                 <view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_RECEIPT">
@@ -36,7 +36,7 @@
                         <view class="desc">请您对此次购物体检进行评价</view>
                     </view>
                     <view class="explain">
-                        <view class="tit">收货30天后将自动评价</view>
+                        <view class="tit">收货{{shopConfigStore?.config?.orderAutoEvalTime}}天后将自动评价</view>
                     </view>
                 </view>
                 <view class="steps-status" v-if="state.orderStatus == OrderAllStatusTypeEnum.aLL_PENDING_EVALUATE">

CoreCms.Net.Uni-App/CoreShop/pages/subpackage/member/order/list/list.vue

@@ -1,11 +1,10 @@
 <template>
-	<coreshop-page title="我的订单" mode="left">
+	<coreshop-page title="我的订单1" mode="left">
 		<view class="layout-order-box">
 			<view class="tab-box">
 				<uv-tabs :list="state.tabList" :activeStyle="{ 'color': '#D33123' }" lineColor="#D33123" :lineWidth="40"
 					:scrollable="false" :current="state.tabsCurrent" keyName="title" @click="handleChangeTab"></uv-tabs>
 			</view>
-
 			<view class="order-list-box">
 				<view class="order-box">
 					<view v-if="state.orderList.length > 0">