From 9ad9069c054c57d6e4603f538cbd57189f47126e Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Fri, 29 Mar 2024 11:16:55 +0800
Subject: [PATCH 1/6] 2
---
pages/mine/addAddress/index.wxml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/mine/addAddress/index.wxml b/pages/mine/addAddress/index.wxml
index a2d8d83..203120e 100644
--- a/pages/mine/addAddress/index.wxml
+++ b/pages/mine/addAddress/index.wxml
@@ -45,7 +45,7 @@
-
+
家
From d3fc992bb8492405e37324ff9ab01f2a29a93055 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Fri, 29 Mar 2024 11:17:13 +0800
Subject: [PATCH 2/6] 2
---
project.private.config.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/project.private.config.json b/project.private.config.json
index 690cd1f..09b37c9 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -193,5 +193,5 @@
]
}
},
- "libVersion": "3.4.0"
+ "libVersion": "3.0.0"
}
\ No newline at end of file
From 0bdcb83c8bdeefa19465d08f2ce6d232f3b69c6c Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Fri, 29 Mar 2024 11:26:13 +0800
Subject: [PATCH 3/6] 1
---
pages/mine/opinion/index.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pages/mine/opinion/index.js b/pages/mine/opinion/index.js
index 351f0d0..0f307cf 100644
--- a/pages/mine/opinion/index.js
+++ b/pages/mine/opinion/index.js
@@ -202,7 +202,8 @@ console.log(that.data.newAddImg)
data: {
content: that.data.textVal,
classify: Number(that.data.actived + 1),
- imgs:that.data.newAddImg.toString()
+ imgs:that.data.newAddImg.toString(),
+ appId:app.globalData.appId
},
success: function (res) {
console.log(res);
From 99f2cbc74bd139c7302bd76d878bf013bd5841e1 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Fri, 29 Mar 2024 11:34:43 +0800
Subject: [PATCH 4/6] 2
---
pages/mine/opinion/index.js | 13 +++++++++----
project.private.config.json | 7 +++++++
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/pages/mine/opinion/index.js b/pages/mine/opinion/index.js
index 0f307cf..2ff97c2 100644
--- a/pages/mine/opinion/index.js
+++ b/pages/mine/opinion/index.js
@@ -14,12 +14,15 @@ Page({
troubleList:[
"投诉", "建议", "故障", "其他"
],
- actived:0
+ actived:0,
+ count:4,
},
chooseMedia () {
var that = this;
+
+ console.log( that.data.count)
wx.chooseMedia({
- count: 4,
+ count: that.data.count,
mediaType: ['image'],
sizeType: ['original', 'compressed'],
sourceType: ['album', 'camera'],
@@ -51,7 +54,8 @@ Page({
that.data.newAddImg.push(JSON.parse(res.data).data)
that.setData({
files: that.data.files,
- newAddImg: that.data.newAddImg
+ newAddImg: that.data.newAddImg,
+ count: 4 - that.data.files.length
})
// currData.data = JSON.parse(res.data);
@@ -91,7 +95,8 @@ Page({
that.pushImg();
that.setData({
files: that.data.files,
- newAddImg: that.data.newAddImg
+ newAddImg: that.data.newAddImg,
+ count: 4 - that.data.files.length
})
} else if (res.cancel) {
diff --git a/project.private.config.json b/project.private.config.json
index 09b37c9..699b89e 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -8,6 +8,13 @@
"condition": {
"miniprogram": {
"list": [
+ {
+ "name": "我的2",
+ "pathName": "pages/mine/index",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
+ },
{
"name": "反馈与建议",
"pathName": "pages/mine/opinion/index",
From 1a9b909d7d5494a2233e81e7a286b2b7e9e7c751 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Fri, 29 Mar 2024 11:49:19 +0800
Subject: [PATCH 5/6] 2
---
pages/detail/index.js | 2 +-
pages/detail/index.wxml | 7 ++++---
pages/detail/index.wxss | 2 +-
pages/index/index.wxml | 4 ++--
pages/index/index.wxss | 2 +-
5 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/pages/detail/index.js b/pages/detail/index.js
index 0e3e632..16b3725 100644
--- a/pages/detail/index.js
+++ b/pages/detail/index.js
@@ -167,7 +167,7 @@ Page({
let resImg = e.currentTarget.dataset.src;
var imgArr = [];
- this.data.jobDetail.storeImage.forEach((item) => {
+ this.data.images.forEach((item) => {
// let regs = /\.(jpg|jpeg|png)(\?.*)?$/;
// item.isImg = regs.test(item.url.toLowerCase());
if (item.isImg) {
diff --git a/pages/detail/index.wxml b/pages/detail/index.wxml
index 95cf50e..361c4c8 100644
--- a/pages/detail/index.wxml
+++ b/pages/detail/index.wxml
@@ -28,11 +28,12 @@
- {{jobDetail.hourlyPay || '--'}}
+
+ {{jobDetail.monthlyPay || '--'}}元/月
- {{jobDetail.monthlyPay || '--'}}
+
@@ -60,7 +61,7 @@
-
+
diff --git a/pages/detail/index.wxss b/pages/detail/index.wxss
index 5d6b792..fb7d76b 100644
--- a/pages/detail/index.wxss
+++ b/pages/detail/index.wxss
@@ -40,7 +40,7 @@ page,
margin-right: 16px;
}
.jobMoney {
- font-size: 18px;
+ font-size: 16px;
font-weight: 601;
line-height: 20px;
}
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index ebac193..c63b65e 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -296,7 +296,7 @@
{{item.jobName || item.aliasName}}
- {{item.salaryClassifyValue}}
+ {{item.monthlyPay}}元/月
@@ -305,7 +305,7 @@
{{ item.distanceKm}}
{{item.age}}
-
+
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 7c1bb3c..5d2cdf6 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -375,7 +375,7 @@ height: 746rpx;
}
.hourPay {
/* f18 c633 lh1 flex-1 tr */
- font-size: 18px;
+ font-size: 16px;
line-height: 1;
flex: 1;
text-align: right;
From c495701c5cc9b1fd1823fd3dd31ec56294bdbb38 Mon Sep 17 00:00:00 2001
From: zsk <710162063@qq.com>
Date: Fri, 29 Mar 2024 13:38:12 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=96=AA=E8=B5=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages/collect/index.wxml | 2 +-
pages/jobListSearch/index.wxml | 2 +-
pages/type/type/index.wxml | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pages/collect/index.wxml b/pages/collect/index.wxml
index c9ccf1a..66a4b36 100644
--- a/pages/collect/index.wxml
+++ b/pages/collect/index.wxml
@@ -38,7 +38,7 @@
{{item.jobName || item.aliasName}}
- {{item.salaryClassifyValue}}
+ {{item.monthlyPay}}元/月
diff --git a/pages/jobListSearch/index.wxml b/pages/jobListSearch/index.wxml
index 0490109..e857b35 100644
--- a/pages/jobListSearch/index.wxml
+++ b/pages/jobListSearch/index.wxml
@@ -276,7 +276,7 @@
{{item.jobName}}
{{item.aliasName}}
- {{item.salaryClassifyValue}}
+ {{item.monthlyPay}}元/月
diff --git a/pages/type/type/index.wxml b/pages/type/type/index.wxml
index 3ae8e80..b8f4540 100644
--- a/pages/type/type/index.wxml
+++ b/pages/type/type/index.wxml
@@ -34,8 +34,8 @@
- {{item.jobName || item.aliasName}}
- {{item.salaryClassifyValue}}
+ {{item.jobName || item.aliasName}}
+ {{item.monthlyPay}}元/月