diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index b484b40..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index 9123e94..bb542a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /unpackage /node_modules /.hbuilderx +/unpackage/dist diff --git a/apis/index.js b/apis/index.js index 778e946..e7f07d3 100644 --- a/apis/index.js +++ b/apis/index.js @@ -9,8 +9,8 @@ import router from '../router' // 基础配置 const config = { - // apiUrl : 'https://api.gongli.vip/api/', // 正式环境 - apiUrl: 'http://api.gl.shangkelian.cn/api/', // 测试 + apiUrl : 'https://api.gongli.vip/api/', // 正式环境 + // apiUrl: 'http://api.gl.shangkelian.cn/api/', // 测试 timeout: 60000 } @@ -46,7 +46,6 @@ const request = (parameter, hideLoding = true) => { data: parameter.data || {}, method: parameter.method || 'GET', success: res => { - console.log(res); if (res.header.Authorization) { updateToken('token', res.header.Authorization) } diff --git a/manifest.json b/manifest.json index 38b0460..0085ba7 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "共力生态", "appid" : "__UNI__DE7B0E6", "description" : "共力生态", - "versionName" : "1.0.42", + "versionName" : "1.0.44", "versionCode" : 100, "transformPx" : false, /* 5+App特有相关 */ @@ -211,5 +211,7 @@ "uniStatistics" : { "enable" : true } - } + }, + "fallbackLocale" : "zh-Hans", + "locale" : "auto" } diff --git a/pages/.DS_Store b/pages/.DS_Store deleted file mode 100644 index 9495dd9..0000000 Binary files a/pages/.DS_Store and /dev/null differ diff --git a/pages/store/goods.vue b/pages/store/goods.vue index e4750ce..4392e57 100644 --- a/pages/store/goods.vue +++ b/pages/store/goods.vue @@ -387,11 +387,11 @@ } } this.specselect = newlist - }, - toVip() { - uni.navigateTo({ - url: '/pages/store/vip/index/index?id=' + this.goods.shop.shop_id, - }) + }, + toVip(){ + uni.navigateTo({ + url: '/pages/store/vip/index/index?id=' + this.goods.shop.shop_id + '&identityId=' + this.goods.shop_vip.card.identity_id, + }) }, // 会员商品领取 vipBuy() { diff --git a/pages/store/vip/index/index.vue b/pages/store/vip/index/index.vue index 03af3cb..a140d6f 100644 --- a/pages/store/vip/index/index.vue +++ b/pages/store/vip/index/index.vue @@ -1,8 +1,8 @@