diff --git a/common/api.js b/common/api.js
index ea08f9f..e1a416a 100644
--- a/common/api.js
+++ b/common/api.js
@@ -1,9 +1,9 @@
// appId: 正式 null | 测试 wxb35ef055a4dd8ad4
-export const DEV = "dev"; // dev 测试 | prod 正式
+export const DEV = "prod"; // dev 测试 | prod 正式
export const VERSION = '1.0.0'; // 版本号
export const DEVURL = 'https://gxsky.lanzulive.com'; // 测试服请求地址
-// export const DEVURL = 'http://192.168.3.23'; // 测试服请求地址, 韦港电脑
-export const PRODURL = ''; // 正式服请求地址
+// export const DEVURL = 'http://192.168.3.8'; // 测试服请求地址, 韦港电脑
+export const PRODURL = 'https://mall.gxsky.com'; // 正式服请求地址
/* 首页相关接口 */
export const API_CATEGORY_LIST = '/api/category/list'; // 首页-分类
diff --git a/common/http.js b/common/http.js
index 50b0f44..0482d1a 100644
--- a/common/http.js
+++ b/common/http.js
@@ -18,8 +18,12 @@ function getsign(params) {
arr.push(k + '=' + v);
}
s_data = arr.join('&');
-
- let sign = sha1(SparkMD5.hash(s_data) + 'lanzu@123');
+
+ //测试
+ // let sign = sha1(SparkMD5.hash(s_data) + 'lanzu@123');
+
+ //正式
+ let sign = sha1(SparkMD5.hash(s_data) + 'base64:8oVqQuUYKI+Fg2iPP1VZwqTbMvpphc/oqhU5+Hzul+4=');
params.sign = sign;
return params;
}
diff --git a/common/shared.js b/common/shared.js
index 7ab6a62..043dfaf 100644
--- a/common/shared.js
+++ b/common/shared.js
@@ -11,6 +11,8 @@ export function isRight(obj) {
}
} else if (isValueType(obj) === 'number' && (isValueType(obj) === "number" && !isNaN(obj)) && obj !== 0) {
return true;
+ } else if (isValueType(obj) === 'boolean') {
+ return obj
}
for (var key in obj) {
return true;
diff --git a/pages.json b/pages.json
index 475697e..efb0074 100644
--- a/pages.json
+++ b/pages.json
@@ -7,7 +7,8 @@
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "首页",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": false,
+ "disableScroll": true
}
},
{
@@ -20,14 +21,16 @@
"path": "pages/order/index",
"style": {
"navigationBarTitleText": "我的订单",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": false,
+ "disableScroll": true
}
},
{
"path": "pages/shopOrder/index",
"style": {
"navigationBarTitleText": "商户订单",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": false,
+ "disableScroll": true
}
},
{
diff --git a/pages/collect/index.vue b/pages/collect/index.vue
index cc3c6af..9cc922b 100644
--- a/pages/collect/index.vue
+++ b/pages/collect/index.vue
@@ -15,12 +15,12 @@
- 取消收藏
+ 取消收藏
- 添加收藏
+ 添加收藏
@@ -133,4 +133,11 @@
}
}
}
+ .collect-btn{
+ display: inline-block;
+ padding: 2rpx 9rpx;
+ border: 1rpx solid #333333;
+ border-radius: 20rpx;
+ font-size: 22rpx;
+ }
diff --git a/pages/goodsDetail/index.vue b/pages/goodsDetail/index.vue
index 3cf70c6..dde9d75 100644
--- a/pages/goodsDetail/index.vue
+++ b/pages/goodsDetail/index.vue
@@ -26,7 +26,7 @@
{{ goods_detail.specs[0].sold_stock_text }}
- {{ goods_detail.specs[0].stock_text }}
+ {{ goods_detail.specs[0].stock_text }}
@@ -352,14 +352,14 @@
})
},
// 打开地图
- openMap() {
- // return;
+ openMap(){
+ let { address, lat, lng } = this.goods_detail?.store || {};
uni.openLocation({
- longitude: 108.36637,
- latitude: 22.817746,
- scale: 18,
- name: this.goods_detail.store.address
- })
+ longitude: Number(lat),
+ latitude: Number(lng),
+ scale: 20,
+ name: address
+ });
},
// 跳转到确认下单页面
toAddOrder() {
diff --git a/pages/order/apply-details.vue b/pages/order/apply-details.vue
index 92995d1..f112d0d 100644
--- a/pages/order/apply-details.vue
+++ b/pages/order/apply-details.vue
@@ -8,7 +8,7 @@
-
+
{{orderDetails.order.goods.name}}
数量 x{{orderDetails.order.number}}
diff --git a/pages/order/apply-refund.vue b/pages/order/apply-refund.vue
index ace4faf..d51876b 100644
--- a/pages/order/apply-refund.vue
+++ b/pages/order/apply-refund.vue
@@ -8,7 +8,7 @@
-
+
{{applyDetails.order.goods.name}}
数量 x{{applyDetails.order.number}}
@@ -77,8 +77,9 @@
-
@@ -143,6 +144,9 @@
},1000)
},
methods: {
+ dynamicLength(){
+ return parseInt(this.applyInfo.length);
+ },
getApplyDetails() {
this.$http(this.API.API_APPLY_DETAILS, {order_id: this.order_id}).then(res => {
if(res.code == 0) {
@@ -339,10 +343,17 @@
}
.area-self {
width: 100%;
- padding: 30rpx 0 0 30rpx;
- color: #999999;
+ padding: 30rpx;
+ padding-bottom: 36rpx;
+ color: #333;
border: 1px solid #D0D0D0;
border-radius: 10rpx;
}
-
+ .font-change{
+ position: absolute;
+ right: 10rpx;
+ bottom: 10rpx;
+ width: max-content;
+ color: #777777;
+ }
diff --git a/pages/order/confirm-atonce.vue b/pages/order/confirm-atonce.vue
index 0e00d7a..09a24b1 100644
--- a/pages/order/confirm-atonce.vue
+++ b/pages/order/confirm-atonce.vue
@@ -8,7 +8,7 @@
-
+
{{orderDetails.goods.name}}
diff --git a/pages/order/confirm-order.vue b/pages/order/confirm-order.vue
index 2e5879c..138d041 100644
--- a/pages/order/confirm-order.vue
+++ b/pages/order/confirm-order.vue
@@ -8,7 +8,7 @@
-
+
{{orderDetails.goods.name}}
@@ -137,9 +137,13 @@
methods: {
changeNum(num) {
if(num > this.limit) {
- this.$msg('该商品限购'+this.limit+'件')
- this.num = this.limit
- return
+ if(this.limit == 0 || this.limit == '') {
+ this.num = num
+ }else {
+ this.$msg('该商品限购'+this.limit+'件')
+ this.num = this.limit
+ return
+ }
}else if(num < 1) {
this.num = 1
}
@@ -153,12 +157,14 @@
})
},
reduce() {
- if (this.num === 1) return
+ if (this.num === 1 || this.num === 0) return
this.num--
},
add() {
if(this.num < this.limit) {
this.num++
+ }else if(this.limit == 0 || this.limit == ''){
+ this.num++
}else {
this.$msg('该商品限购'+this.limit+'件')
this.num = this.limit
diff --git a/pages/order/index.vue b/pages/order/index.vue
index eea3276..7885a80 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -204,6 +204,7 @@
tab_item.page = 1;
tab_item.isPage = true;
tab_item.loadingClass = true;
+ tab_item.list = []
tab_item.loadingText = '正在加载中';
this.getUserOrder(options);
}
@@ -248,7 +249,7 @@
.title {
font-size: 28rpx;
color: $u-content-color;
- height: 98rpx;
+ height: 80rpx;
}
// tab
@@ -261,6 +262,7 @@
// 商品列表
.com {
width: 100%;
+ height: 100%;
overflow: hidden;
.list {
diff --git a/pages/order/order-details.vue b/pages/order/order-details.vue
index a28e213..ff24a8d 100644
--- a/pages/order/order-details.vue
+++ b/pages/order/order-details.vue
@@ -7,7 +7,7 @@
-
+
{{orderDetails.goods.name}}
数量 x{{orderDetails.number}}
diff --git a/pages/order/unpay-details.vue b/pages/order/unpay-details.vue
index 8372167..733e3ba 100644
--- a/pages/order/unpay-details.vue
+++ b/pages/order/unpay-details.vue
@@ -8,7 +8,7 @@
-
+
{{orderDetails.goods.name}}
数量 x{{orderDetails.number}}
diff --git a/pages/shopOrder/index.vue b/pages/shopOrder/index.vue
index 4e1a3b0..2b1031c 100644
--- a/pages/shopOrder/index.vue
+++ b/pages/shopOrder/index.vue
@@ -206,6 +206,7 @@
// 商品列表
.com {
width: 100%;
+ height: 100%;
overflow: hidden;
.list {
diff --git a/uview-ui/components/u-tabs/u-tabs.vue b/uview-ui/components/u-tabs/u-tabs.vue
index cd24818..2d83f20 100644
--- a/uview-ui/components/u-tabs/u-tabs.vue
+++ b/uview-ui/components/u-tabs/u-tabs.vue
@@ -178,7 +178,11 @@
// 后台获取的（如新闻app顶部的菜单），获取返回需要一定时间，所以list变化时，重新获取布局信息
list(n, o) {
// list变动时，重制内部索引，否则可能导致超出数组边界的情况
- if(n.length !== o.length) this.currentIndex = 0;
+ if(n.length !== o.length){
+ this.currentIndex = 0;
+ }else{
+ return;
+ }
// 用$nextTick等待视图更新完毕后再计算tab的局部信息，否则可能因为tab还没生成就获取，就会有问题
this.$nextTick(() => {
this.init();