zhaoyun 15 hodín pred
rodič
commit
4af42a0535

+ 3 - 2
mer_uniapp/config/app.js

@@ -8,8 +8,9 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 //移动端商城API 网络接口修改此配置,小程序域名要求https 例如:https://api.front.merchant.java.crmeb.net
-let domain = 'https://hncsyy.com.cn'
-//domain = 'https://cswanwu.com.cn'
+//let domain = 'https://hncsyy.com.cn'
+let domain = 'https://cswanwu.com.cn'
+//let domain ='http://47.115.34.96:20710'
 //let domain = 'http://127.0.0.1:20810' 
 
 module.exports = {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 277 - 0
mer_uniapp/manifes-dev.json


+ 4 - 4
mer_uniapp/manifes-prod.json

@@ -129,7 +129,7 @@
                 "oauth" : {
                     "apple" : {},
                     "weixin" : {
-                        "appid" : "wxa83d6fab40cab13f",
+                        "appid" : "wx7a0eaf18a8203184",
                         "appsecret" : "e1d254e4c6a68b10bd60bd347bf0ffba",
                         "UniversalLinks" : "https://app.beta.java.crmeb.net/"
                     }
@@ -142,14 +142,14 @@
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "wxa83d6fab40cab13f",
+                        "appid" : "wx7a0eaf18a8203184",
                         "UniversalLinks" : "https://app.beta.java.crmeb.net/"
                     }
                 },
                 "payment" : {
                     "weixin" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appid" : "wxa83d6fab40cab13f",
+                        "appid" : "wx7a0eaf18a8203184",
                         "UniversalLinks" : "https://app.beta.java.crmeb.net/"
                     },
                     "alipay" : {
@@ -198,7 +198,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx6357992aa9b1ca10",
+        "appid" : "wx7a0eaf18a8203184",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 277 - 0
mer_uniapp/manifest-dev.json


+ 1 - 1
mer_uniapp/manifest.json

@@ -198,7 +198,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx6357992aa9b1ca10",
+        "appid" : "wx7a0eaf18a8203184",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

+ 22 - 2
mer_uniapp/pages/order/index.vue

@@ -83,6 +83,12 @@
 		userMark,
 		getOrderList
 	} from '@/api/order.js';
+	import {
+		mapGetters
+	} from "vuex";
+	import {
+		tokenIsExistApi
+	} from '@/api/api.js';
 	var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
 	let app = getApp();
 	export default {
@@ -104,14 +110,19 @@
 				ProductTypeEnum,
 				change:false,
 				orderInfo:{},
-				status: ""
+				status: "",
+				tokenIsExist: false, //校验token是否有效
 			}
 		},
+		computed: {
+			...mapGetters(['isLogin', 'productType', 'globalData', 'bottomNavigationIsCustom']),
+		},
 		//下拉刷新
 		onPullDownRefresh() {
 
 		},
 		onLoad(options) {
+			this.getTokenIsExist();
 			let that = this;
 			//首页数据加载
 			// this.getIndexConfig();
@@ -122,13 +133,22 @@
 			this.navigationBarHeight = custom.height + (custom.top - this.statusBarHeight) * 2
 			// console.log("导航栏高度:"+this.globalData.navigationBarHeight)
 			// #endif
-			this.getOrderList() //订单列表
+			
 
 		},
 		onShow() {
 
 		},
 		methods: {
+			//校验token是否有效,true为有效,false为无效
+			getTokenIsExist() {
+				tokenIsExistApi().then(res => {
+					this.tokenIsExist = res.data;
+					if (this.isLogin && this.tokenIsExist) {
+						this.getOrderList() //订单列表
+					}
+				})
+			},
 			modify: function(item, status) {
 				this.change = true;
 				this.status = status.toString();