From b775d4cf78764c8f5732f918a7c7cc9bfecb120c Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 11 Sep 2023 14:09:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=87=E7=BA=A7=E5=BC=B9?=
=?UTF-8?q?=E7=AA=97=EF=BC=8C=E4=BB=A5=E5=8F=8A=E5=A7=94=E6=89=98=E8=AE=A2?=
=?UTF-8?q?=E5=8D=95=EF=BC=8C=E6=96=87=E7=AB=A0=E8=AF=A6=E6=83=85=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../delegation_details/index.vue | 20 +++++---
pages/index/index.vue | 11 +---
pages/plantGrass/plant_detail/index.vue | 2 +
store/modules/app.js | 51 ++++++++++---------
4 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 6d24b4c..954c7ff 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -12,7 +12,7 @@
- {{objinfo.entrust_start_date}}
+ {{objinfo.entrust_start_date}}
@@ -44,7 +44,7 @@
委托方:
-
+
{{objinfo.mer_info.mer_name}}
@@ -52,7 +52,7 @@
被委托方:
-
+
{{objinfo.entrust_mer_info.mer_name}}
@@ -114,7 +114,7 @@
-
+
@@ -163,14 +163,22 @@
},
methods: {
-
+ //商品详情
list(id) {
entrustdetail(id).then((res) => {
-console.log(res.data)
+
this.objinfo = res.data
})
},
+ //商品宝贝详情
+ Merchbaby(item) {
+ uni.navigateTo({
+ url: `/pages/goods_details/index?id=${item.product_id}`
+ })
+ },
+
+ //提交购物车
submit(item) {
addEntrustCart({
community_id: item.community_id
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1b44c87..cdd710e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -157,16 +157,7 @@
}
},
onShow() {
- uni.startLocationUpdate({
- success: res => {
- console.log('开启接收位置消息成功')
-
- },
- fail: err => {
- this.selfLocation()
- },
- complete: msg => console.log('调用开启接收位置消息 API 完成')
- });
+
//监听网络状态变化
uni.onNetworkStatusChange((res) => {
diff --git a/pages/plantGrass/plant_detail/index.vue b/pages/plantGrass/plant_detail/index.vue
index 2e53c0e..acaf1d9 100644
--- a/pages/plantGrass/plant_detail/index.vue
+++ b/pages/plantGrass/plant_detail/index.vue
@@ -1,8 +1,10 @@
+
+
diff --git a/store/modules/app.js b/store/modules/app.js
index 18284f4..f0cfc17 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -117,38 +117,43 @@ const actions = {
} else {
apptype = 1
}
- console.log(apptype, '11111')
+
Appversion({
version: os.appWgtVersion,
type: apptype
}).then((res) => {
- if (data) uni.showLoading({
- title: '检查更新中'
- })
+
+ if (Object.keys(res.data.appInfo).length > 0) {
- // 版本更新
- if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
- compareVersions(res.data.appInfo.version,
- wgt_v) == 1) {
- try {
- let info = res.data.appInfo || {};
- let version = {
- title: info.title || '发现新版本',
- content: info.content || '修复了部分BUG',
- versionName: info.version || '1.0.1',
- downUrl: info.dow_url || '',
- force: info.force == 1 ? true : false, // 是否强制更新
- quiet: info.quiet == 1 ? true : false // 是否静默更新
+
+ uni.showLoading({
+ title: '检查更新中'
+ })
+
+ // 版本更新
+ if (compareVersions(res.data.appInfo.version, os.appWgtVersion || wgt_v) == 1 &&
+ compareVersions(res.data.appInfo.version,
+ wgt_v) == 1) {
+ try {
+ let info = res.data.appInfo || {};
+ let version = {
+ title: info.title || '发现新版本',
+ content: info.content || '修复了部分BUG',
+ versionName: info.version || '1.0.1',
+ downUrl: info.dow_url || '',
+ force: info.force == 1 ? true : false, // 是否强制更新
+ quiet: info.quiet == 1 ? true : false // 是否静默更新
+ }
+ Updater.update(version);
+ } catch (e) {
+ console.log(e);
}
- Updater.update(version);
- } catch (e) {
- console.log(e);
+ uni.hideLoading();
}
- if (data) uni.hideLoading();
- }
+ }
}).catch((err) => {
- console.log(err)
+ // console.log(err)
})