diff --git a/manifest.json b/manifest.json
index 0278643..50c0a58 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "惠农商户平台",
"appid" : "__UNI__1EE148C",
"description" : "",
- "versionName" : "1.2.4",
- "versionCode" : 124,
+ "versionName" : "1.2.9",
+ "versionCode" : 129,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1307631..a0cf429 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -312,9 +312,8 @@
公司名称:
-
- {{merchantData.company_name}}
-
+
@@ -862,7 +861,7 @@ import { Toast } from '../../libs/uniApi';
that.validate = true;
this.num = 15
this.isFshow = false;
- this.$refs.popup.close()
+ this.$refs.popup.close();
that.$util.Tips({
title: res
});
@@ -1230,12 +1229,13 @@ import { Toast } from '../../libs/uniApi';
if (this.userid) {
- if (this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
+ if ( this.userInfoData.mer_info.mer_settlement_agree_status == 0) {
// console.log(this.$store.state.app.userInfo.mer_info.type_code);
if(this.$store.state.app.userInfo.mer_info.type_code=="TypeSupplyChain"&&this.$store.state.app.userInfo.mer_info.type_code=="PersonalStore"){
this.agree()
// this.countDown()
- } else if (this.codenote.length == 0) {
+ }
+ else if (this.codenote.length == 0) {
this.isFshow = true
this.countDown()
} else {
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 73c15ef..30fe663 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -222,9 +222,9 @@
¥{{totalMoney}}
-
+
diff --git a/pages/nongKe/cloud_entrepot/indexOther.vue b/pages/nongKe/cloud_entrepot/indexOther.vue
index 592a741..92e635e 100644
--- a/pages/nongKe/cloud_entrepot/indexOther.vue
+++ b/pages/nongKe/cloud_entrepot/indexOther.vue
@@ -137,7 +137,7 @@
¥{{totalMoney}}
- {{tips||'支持配送 售后无忧'}}
+ {{tips}}
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
index 9d2cfa0..e44d811 100644
--- a/pages/nongKe/cloud_entrepot/indexa.vue
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -179,9 +179,9 @@
¥{{totalMoney}}
-
+
diff --git a/pages/nongKe/cloud_entrepot/indexb.vue b/pages/nongKe/cloud_entrepot/indexb.vue
index ec2e9fd..1b62a47 100644
--- a/pages/nongKe/cloud_entrepot/indexb.vue
+++ b/pages/nongKe/cloud_entrepot/indexb.vue
@@ -136,9 +136,9 @@
¥{{totalMoney}}
-
+
diff --git a/pages/users/embody/embody.vue b/pages/users/embody/embody.vue
index f1fb21d..de7703c 100644
--- a/pages/users/embody/embody.vue
+++ b/pages/users/embody/embody.vue
@@ -20,23 +20,32 @@