From 027e0a0856cfb3b3ee32ef36d36700605c723efb Mon Sep 17 00:00:00 2001 From: weipengfei <2187978347@qq.com> Date: Thu, 4 Jan 2024 18:55:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 4 ++-- pages/gather/gather.vue | 2 +- pages/nongKe/cloud_entrepot/indexh.vue | 6 ++--- pages/store/settled/index.vue | 31 ++++++++++++++++++++++++-- 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index d6521a4..999f75b 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "惠农生活", "appid" : "__UNI__3A527D1", "description" : "", - "versionName" : "1.6.9", - "versionCode" : 169, + "versionName" : "1.7.0", + "versionCode" : 170, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue index 4596449..07c79a8 100644 --- a/pages/gather/gather.vue +++ b/pages/gather/gather.vue @@ -164,13 +164,13 @@ }, created() {}, onLoad() { - this.initAllAppLet(); this.Area(); }, onShow() { if (this.isLogin) { this.emptyText = '暂无可用应用' this.jurisdiction = false + this.initAllAppLet(); } else { this.emptyText = '请登录' this.jurisdiction = true diff --git a/pages/nongKe/cloud_entrepot/indexh.vue b/pages/nongKe/cloud_entrepot/indexh.vue index 25964a6..6071aa3 100644 --- a/pages/nongKe/cloud_entrepot/indexh.vue +++ b/pages/nongKe/cloud_entrepot/indexh.vue @@ -126,7 +126,7 @@ + @click="navgo('/pages/order_addcart/order_addcart?source=103')"> { this.totalMoney = 0 this.cartList = res.data.list @@ -786,7 +786,7 @@ }) getCartCounts({ source: 103, - product_type: 98 + // product_type: 98 }).then(res => { this.goodsNum = res.data[0].count }) diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue index b4cb8c6..99fa040 100644 --- a/pages/store/settled/index.vue +++ b/pages/store/settled/index.vue @@ -115,7 +115,7 @@ - + + + + + + 公司性质 + + + + + + + + + @@ -384,10 +402,12 @@ import { Toast } from '../../../libs/uniApi'; index1: 0, index2: [0, 0, 0], mer_classification: "", + nature_business: 0, array: [{ category_name: '', merchant_category_id: '' }], + companyTypeList: ['对公户', '个体户'], bindPickerChangeidx: [], storeTypeArr: [{ type_name: '', @@ -644,6 +664,10 @@ import { Toast } from '../../../libs/uniApi'; } } }, + // 选择公司性质 + natureBusinessChange(e){ + this.nature_business = this.companyTypeList[e.detail.value]=='个体户'?2:1; + }, bindPickerChange: function(e) { // console.log(e.detail); // this.index = e.target.value[1]; @@ -926,6 +950,7 @@ import { Toast } from '../../../libs/uniApi'; social_credit_code: that.merchantData.social_credit_code, merchant_category_id: that.merchantData.classification, merchant_category_name: that.mer_classification, + is_company: that.nature_business==1?1:0, // 是否是公司, 1是公司, 0是个体 mer_type_id: that.merchantData.mer_type, mer_storeType: this.mer_storeType, area_id: this.area_id, @@ -1105,7 +1130,9 @@ import { Toast } from '../../../libs/uniApi'; if (!this.mer_classification) return that.$util.Tips({ title: '请选择商户分类' }); - + if (!this.nature_business) return that.$util.Tips({ + title: '请选择公司性质' + }) if (!this.mer_storeType) return that.$util.Tips({ title: '请选择店铺类型' })