diff --git a/config/index.js b/config/index.js
index fb7e7d1..55e24c5 100644
--- a/config/index.js
+++ b/config/index.js
@@ -11,7 +11,7 @@ module.exports = (() => {
config.Timeout = 10000 // 请求超时时间,单位 ms
// 基础服务器地址
-//config.BASE_URL = 'http://localhost:8000' // 开发环境
+ // config.BASE_URL = 'http://localhost:8000' // 开发环境
config.BASE_URL = 'https://qxk.leadfyy.com' // 开发环境
// config.BASE_URL = '' // 生产环境
diff --git a/manifest.json b/manifest.json
index f131a0f..fae5832 100644
--- a/manifest.json
+++ b/manifest.json
@@ -50,7 +50,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
- "appid" : "wxb35ef055a4dd8ad4",
+ "appid" : "wx1d5b6a2773c15b58",
"setting" : {
"urlCheck" : false
},
diff --git a/packages/ratingQueryDetail/ratingQueryDetail.vue b/packages/ratingQueryDetail/ratingQueryDetail.vue
index dfe1a40..c0825b1 100644
--- a/packages/ratingQueryDetail/ratingQueryDetail.vue
+++ b/packages/ratingQueryDetail/ratingQueryDetail.vue
@@ -23,6 +23,10 @@
发行商
{{ details.sub_order.publisher }}
+
+ 卡片限编
+ {{ details.sub_order.limit_num }}
+
@@ -91,6 +95,7 @@
imageList(){
let list = [];
if(this.details.sub_order){
+ if(!this.details.sub_order.images_url) return list;
let count = this.details.sub_order.images_url.length;
list = this.details.sub_order.images_url;
diff --git a/packages/sonpingDetail/expenseDetail.vue b/packages/sonpingDetail/expenseDetail.vue
index a7fbde7..e5a9d7e 100644
--- a/packages/sonpingDetail/expenseDetail.vue
+++ b/packages/sonpingDetail/expenseDetail.vue
@@ -4,23 +4,29 @@
- 费用合计
- ¥{{ details.total }}
+ 订单费用
+ ¥{{ Number.parseFloat(details.total) + details.discount }}
订单折扣
- {{ details.discount && details.discount > 0 ? details.discount +'折' : '无' }}
+ {{ details.discount && details.discount > 0 ? '- ¥' : '' }}{{ details.discount && details.discount > 0 ? details.discount +'' : '无' }}
+
+ 费用合计
+ ¥{{ details.total }}
+
-
+
+
+
@@ -107,11 +113,17 @@
details.other.forEach(item => {
item.total = new Bigc(item.num).times(item.amount).round(2, 0);
})
+ details.grading_cost.forEach(item => {
+ item.total = new Bigc(item.num).times(item.amount).round(2, 0);
+ })
this.details = details;
- this.$nextTick(()=>{
- this.$refs.myCollapse.init();
- this.$refs.myCollapse2.init();
- });
+ setTimeout(()=>{
+ this.$nextTick(()=>{
+ this.$refs.myCollapse.init();
+ this.$refs.myCollapse2.init();
+ });
+ },200)
+
}
}
@@ -215,6 +227,9 @@
line-height: 44rpx;
white-space: nowrap;
}
+ .text_5_red{
+ color: red;
+ }
.text_18 {
margin-left: 116rpx;
}
diff --git a/packages/sonpingDetail/sonpingDetail.vue b/packages/sonpingDetail/sonpingDetail.vue
index 8432275..fd60409 100644
--- a/packages/sonpingDetail/sonpingDetail.vue
+++ b/packages/sonpingDetail/sonpingDetail.vue
@@ -223,7 +223,7 @@
}else{
uni.showToast({
icon:'none',
- title:'正在评审中'
+ title:'正在评级中'
})
}
}
diff --git a/packages/sonpingDetail/viewDetail.vue b/packages/sonpingDetail/viewDetail.vue
index b43a6c0..b584ede 100644
--- a/packages/sonpingDetail/viewDetail.vue
+++ b/packages/sonpingDetail/viewDetail.vue
@@ -38,6 +38,10 @@
边子系列名称:
{{ item.sub_card_series }}
+
+ 卡片限编:
+ {{ item.limit_num }}
+
卡片编码:
{{ item.card_code }}
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 73797d5..a5cc6af 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -383,8 +383,8 @@
},
fail: err => {
uni.showModal({
- title: '',
- content: 'fail:' + JSON.stringify(err) + '支付失败',
+ title: '提示',
+ content: '已取消订单,请及时支付',
showCancel: false
})
this.clickButton = false;
diff --git a/pages/write/baseInfo.vue b/pages/write/baseInfo.vue
index 5d8960a..8b89f0f 100644
--- a/pages/write/baseInfo.vue
+++ b/pages/write/baseInfo.vue
@@ -180,18 +180,18 @@
let d = uni.getStorageSync('qxk_sysinfo')
if(d){
let options = d.fast_options
- this.columnsData = options.filter((item)=>{
- if(this.rateIndex == 3){
- if(item.id == 0 || item.id == 4){
- return item;
- }
- }else{
- if(item.id <=3){
- return item;
- }
- }
- });
-
+ // this.columnsData = options.filter((item)=>{
+ // if(this.rateIndex == 3){
+ // if(item.id == 0 || item.id == 4){
+ // return item;
+ // }
+ // }else{
+ // if(item.id <=3){
+ // return item;
+ // }
+ // }
+ // });
+ this.columnsData = options
let texts = this.columnsData.map((item)=>{
return item.title
})
diff --git a/static/images/logo.png b/static/images/logo.png
index 475851b..ea69017 100644
Binary files a/static/images/logo.png and b/static/images/logo.png differ