From 04283fafb8216c26d705db21cb0f31a28a5cc68c Mon Sep 17 00:00:00 2001
From: leo <182004222@qq.com>
Date: 星期四, 19 五月 2022 21:54:56 +0800
Subject: [PATCH] 增加派单流程20220519FX
---
GoldC/pages/aditReport/adit.js | 8 +-
GoldC/pages/paiDan/paiDan.wxml | 16 ++---
GoldC/pages/problemList/problemList.wxml | 4
GoldC/pages/aditReport/adit.wxml | 9 +-
GoldC/pages/problemReport/proRep.wxml | 8 +-
GoldC/project.private.config.json | 7 ++
GoldC/pages/problemReport/proRep.js | 11 ++-
GoldC/pages/paiDan/paiDan.js | 20 ++----
GoldC/project.config.json | 40 ++++---------
GoldC/pages/home/home.js | 9 ++
10 files changed, 63 insertions(+), 69 deletions(-)
diff --git a/GoldC/pages/aditReport/adit.js b/GoldC/pages/aditReport/adit.js
index 25165b6..bbc55ae 100644
--- a/GoldC/pages/aditReport/adit.js
+++ b/GoldC/pages/aditReport/adit.js
@@ -22,7 +22,8 @@
//
dis: true,
//
- Reported_Remark: '',//瀹夊叏闂
+ Reported_Remark: 1,//瀹夊叏闂
+ Reported_RemarkList:['瀹夊叏闂','闈炲畨鍏ㄩ棶棰�'],
Dispost_Question: '',//娲惧崟瀹℃牳鎰忚
shangbao: '',
beizhu: '',
@@ -58,7 +59,7 @@
FTimageUrl: JSON.parse(options.data).Reported_Img.replace('..', '').split(","),
listid: JSON.parse(options.data).id,
Dispost_Question: JSON.parse(options.data).Dispost_Question,
- Reported_Remark: JSON.parse(options.data).Reported_Remark ? true : false,
+ Reported_Remark: JSON.parse(options.data).Reported_Remark == '瀹夊叏闂' ? 0 : 1,
})
// 鍙嶅～娓稿褰掑睘涓績
@@ -297,7 +298,8 @@
_Reported_Question: this.data.shangbao,
Dispost_Question: this.data.Dispost_Question,//娲惧崟瀹℃牳鎰忚
_Reported_Address: this.data.detailedaddress,
- _Reported_Remark: this.data.Reported_Remark ? '瀹夊叏闂' : '',
+ _Reported_Remark: this.data.Reported_Remark === 0 ? '瀹夊叏闂' : '',
+ beizhu: this.data.Reported_Remark === 0 ? this.data.beizhu : '',
Tag: this.data.listid,
_Reported_lnglat: this.data.locmap.latitude + ',' + this.data.locmap.longitude,
_fk_Role_Type: this.data.youkecenter[this.data.youkeindex] ? this.data.youkecenter[this.data.youkeindex].pk_TypeId : '',
diff --git a/GoldC/pages/aditReport/adit.wxml b/GoldC/pages/aditReport/adit.wxml
index 980f7b2..ac2e385 100644
--- a/GoldC/pages/aditReport/adit.wxml
+++ b/GoldC/pages/aditReport/adit.wxml
@@ -60,14 +60,15 @@
</view>
<textarea bindinput="shangbao" class="textbox" value="{{shangbao}}" placeholder="璇疯緭鍏ヤ笂鎶ラ棶棰樺唴瀹�..."></textarea>
</view>
-<!-- 闂鏍囩 -->
+<!--瀹夊叏闂-->
<view>
<view class="title">
- <image class="primg" src="/images/ProRep/uptext.png"></image>
+ <image class="primg" src="/images/ProRep/youke.png"></image>
<view>闂鏍囩</view>
</view>
- <checkbox value="{{ Reported_Remark }}" class="textbox" bind:change="choseRemark" style="margin-left: 10px;">瀹夊叏闂
- </checkbox>
+ <picker bindchange="choseRemark" value="{{Reported_Remark}}" range="{{Reported_RemarkList}}" default-index="{{ 1 }}">
+ <view class="chose">{{Reported_RemarkList[Reported_Remark]}}</view>
+ </picker>
</view>
<!-- -->
<view style="display:none">
diff --git a/GoldC/pages/home/home.js b/GoldC/pages/home/home.js
index 00739c9..975098a 100644
--- a/GoldC/pages/home/home.js
+++ b/GoldC/pages/home/home.js
@@ -98,6 +98,11 @@
showtwo: true
})
break;
+ case 13:
+ this.setData({
+ showone: true
+ })
+ break;
}
},
// 璺宠浆闂涓婃姤
@@ -184,7 +189,7 @@
newsnum:res.data.Data.length+numOne
})
}
- })
+ })
}
})
},
@@ -223,4 +228,4 @@
onShareAppMessage: function () {
}
-})
\ No newline at end of file
+})
diff --git a/GoldC/pages/paiDan/paiDan.js b/GoldC/pages/paiDan/paiDan.js
index a430e89..6e74834 100644
--- a/GoldC/pages/paiDan/paiDan.js
+++ b/GoldC/pages/paiDan/paiDan.js
@@ -22,7 +22,8 @@
//
dis: true,
//
- Reported_Remark: ['瀹夊叏闂'],//瀹夊叏闂
+ Reported_Remark: 1,//瀹夊叏闂
+ Reported_RemarkList:['瀹夊叏闂','闈炲畨鍏ㄩ棶棰�'],
Dispost_Question: '',//娲惧崟瀹℃牳鎰忚
shangbao: '',
beizhu: '',
@@ -46,6 +47,7 @@
* 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
*/
onLoad: function (options) {
+ console.log(6666,app.onearr)
console.log(JSON.parse(options.data))
this.setData({
firstallArr: app.firstallArr,
@@ -54,20 +56,12 @@
onearr: app.onearr,
youkecenter: app.youkecenter,
shangbao: JSON.parse(options.data).Reported_Question,
- Reported_Remark: JSON.parse(options.data).Reported_Remark ? ['瀹夊叏闂'] : ['瀹夊叏闂'],
+ Reported_Remark: JSON.parse(options.data).Reported_Remark == '瀹夊叏闂' ? 0 : 1,
Dispost_Question: JSON.parse(options.data).Dispost_Question,
- beizhu: JSON.parse(options.data).Reported_Remark ? JSON.parse(options.data).beizhu : '',
+ beizhu: JSON.parse(options.data).Reported_Remark == '瀹夊叏闂' ? JSON.parse(options.data).beizhu : '',
FTimageUrl: JSON.parse(options.data).Reported_Img.replace('..', '').split(","),
listid: JSON.parse(options.data).id
})
- // Reported_Remark: JSON.parse(options.data).Reported_Remark ? ['瀹夊叏闂'] : ['瀹夊叏闂'],
-
- setTimeout(()=>{
- this.setData({
- Reported_Remark:["瀹夊叏闂"]
- })
- console.log('瀹夊叏闂鍒濆鍖�', this.data.Reported_Remark);
- },1000)
// 鍙嶅～娓稿褰掑睘涓績
this.data.youkecenter.forEach((e) => {
if (e.pk_TypeId === JSON.parse(options.data).fk_Role_Type) {
@@ -304,8 +298,8 @@
_Reported_Question: this.data.shangbao,
Dispost_Question: this.data.Dispost_Question,//娲惧崟瀹℃牳鎰忚
_Reported_Address: this.data.detailedaddress,
- _Reported_Remark: this.data.Reported_Remark.length > 0 ? '瀹夊叏闂' : '',
- beizhu: this.data.Reported_Remark.length > 0 ? this.data.beizhu : '',
+ _Reported_Remark: this.data.Reported_Remark === 0 ? '瀹夊叏闂' : '',
+ beizhu: this.data.Reported_Remark === 0 ? this.data.beizhu : '',
Tag: this.data.listid,
_Reported_lnglat: this.data.locmap.latitude + ',' + this.data.locmap.longitude,
_fk_Role_Type: this.data.youkecenter[this.data.youkeindex] ? this.data.youkecenter[this.data.youkeindex].pk_TypeId : '',
diff --git a/GoldC/pages/paiDan/paiDan.wxml b/GoldC/pages/paiDan/paiDan.wxml
index 622b03c..b9379f8 100644
--- a/GoldC/pages/paiDan/paiDan.wxml
+++ b/GoldC/pages/paiDan/paiDan.wxml
@@ -48,7 +48,7 @@
<image class="primg" src="/images/ProRep/uptext.png"></image>
<view>瀹℃牳娲惧崟鎰忚</view>
</view>
- <textarea bindinput="Dispost_Question" class="textbox" disabled="{{true}}" style="background-color:#dedcdc;"></textarea>
+ <textarea bindinput="Dispost_Question" class="textbox"></textarea>
</view>
<!-- 涓婃姤闂 -->
@@ -59,19 +59,15 @@
</view>
<textarea bindinput="shangbao" class="textbox" value="{{shangbao}}" placeholder="璇疯緭鍏ヤ笂鎶ラ棶棰樺唴瀹�..."></textarea>
</view>
-
-<!-- 闂鏍囩 -->
+<!--瀹夊叏闂-->
<view>
<view class="title">
- <image class="primg" src="/images/ProRep/uptext.png"></image>
+ <image class="primg" src="/images/ProRep/youke.png"></image>
<view>闂鏍囩</view>
- <view>{{Reported_Remark}}</view>
</view>
-<!-- <checkbox value="{{ Reported_Remark }}" class="checkbox" bind:change="choseRemark" style="margin-left: 10px;">瀹夊叏闂</checkbox>-->
-<!-- <van-checkbox value="{{ Reported_Remark }}" class="checkbox" bind:change="choseRemark" style="margin-left: 10px;">瀹夊叏闂</van-checkbox>-->
- <checkbox-group value="{{Reported_Remark}}" bind:change="choseRemark">
- <checkbox name="瀹夊叏闂" value="瀹夊叏闂">瀹夊叏闂</checkbox>
- </checkbox-group>
+ <picker bindchange="choseRemark" value="{{Reported_Remark}}" range="{{Reported_RemarkList}}" default-index="{{ 1 }}">
+ <view class="chose">{{Reported_RemarkList[Reported_Remark]}}</view>
+ </picker>
</view>
<!-- -->
diff --git a/GoldC/pages/problemList/problemList.wxml b/GoldC/pages/problemList/problemList.wxml
index c46801e..d9f555e 100644
--- a/GoldC/pages/problemList/problemList.wxml
+++ b/GoldC/pages/problemList/problemList.wxml
@@ -78,14 +78,14 @@
<text>娲惧崟</text>
</view>
</view>
- <view wx:if="{{ role == 3 }}" class="libtn">
+ <view wx:if="{{ role == 3 && item.ShowExchangeSend}}" class="libtn">
<!-- 杞彂涓灑 -->
<view class="btn btn-adit" bindtap="zhuanFa" data-id="{{item.pk_Examine}}" data-tag="3" style="background-color: purple;">
<van-icon name="edit" class="icon"/>
<text>杞彂涓灑</text>
</view>
</view>
- <view wx:if="{{ role == 13 }}" class="libtn">
+ <view wx:if="{{ role == 13 && item.ShowExchangeBack }}" class="libtn">
<!-- 涓灑閫�鍥� -->
<view class="btn btn-adit" bindtap="zhuanFa" data-id="{{item.pk_Examine}}" data-tag="4" style="background-color: purple;">
<van-icon name="edit" class="icon"/>
diff --git a/GoldC/pages/problemReport/proRep.js b/GoldC/pages/problemReport/proRep.js
index b0d521f..d90927e 100644
--- a/GoldC/pages/problemReport/proRep.js
+++ b/GoldC/pages/problemReport/proRep.js
@@ -22,6 +22,9 @@
//
dis: true,
//
+ // 闂鏍囩
+ Reported_Remark: 1,//瀹夊叏闂
+ Reported_RemarkList:['瀹夊叏闂','闈炲畨鍏ㄩ棶棰�'],
Dispost_Question: '',//瀹℃牳娲惧崟鎰忚
shangbao: '',
beizhu: '',
@@ -37,8 +40,7 @@
// 褰掑睘娓稿涓績
youkecenter: [],
youkeindex: '',
- // 闂鏍囩
- Reported_Remark: true
+
},
/**
@@ -281,7 +283,6 @@
},
// 鎻愪氦
Yes() {
- console.log(22222, this.data.Reported_Remark);
var data = {
_Reported_User: wx.getStorageSync('user').pk_User,
_fk_Management: this.data.firstallArr[this.data.index1] ? this.data.firstallArr[this.data.index1].pk_Management : '',
@@ -290,8 +291,8 @@
_Reported_Question: this.data.shangbao,
Dispost_Question: this.data.Dispost_Question,//瀹℃牳娲惧崟鎰忚
_Reported_Address: this.data.detailedaddress,
- _Reported_Remark: this.data.Reported_Remark.length > 0 ? '瀹夊叏闂' : '',
- beizhu: this.data.Reported_Remark ? this.data.beizhu : '',
+ _Reported_Remark: this.data.Reported_Remark === 0 ? '瀹夊叏闂' : '',
+ beizhu: this.data.Reported_Remark === 0 ? this.data.beizhu : '',
Tag: 0,
_Reported_lnglat: this.data.locmap.longitude + ',' + this.data.locmap.latitude,
_fk_Role_Type: this.data.youkecenter[this.data.youkeindex] ? this.data.youkecenter[this.data.youkeindex].pk_TypeId : '',
diff --git a/GoldC/pages/problemReport/proRep.wxml b/GoldC/pages/problemReport/proRep.wxml
index a8e8306..164382b 100644
--- a/GoldC/pages/problemReport/proRep.wxml
+++ b/GoldC/pages/problemReport/proRep.wxml
@@ -60,13 +60,15 @@
</view>
<textarea bindinput="shangbao" class="textbox" placeholder="璇疯緭鍏ヤ笂鎶ラ棶棰樺唴瀹�..."></textarea>
</view>
-<!-- 闂鏍囩 -->
+<!--瀹夊叏闂-->
<view>
<view class="title">
- <image class="primg" src="/images/ProRep/uptext.png"></image>
+ <image class="primg" src="/images/ProRep/youke.png"></image>
<view>闂鏍囩</view>
</view>
- <checkbox value="Reported_Remark" class="checkbox" bind:change="choseRemark">瀹夊叏闂</checkbox>
+ <picker bindchange="choseRemark" value="{{Reported_Remark}}" range="{{Reported_RemarkList}}" default-index="{{ 1 }}">
+ <view class="chose">{{Reported_RemarkList[Reported_Remark]}}</view>
+ </picker>
</view>
<!-- 褰曞叆澶囨敞 -->
diff --git a/GoldC/project.config.json b/GoldC/project.config.json
index 7629ae4..cacb7ca 100644
--- a/GoldC/project.config.json
+++ b/GoldC/project.config.json
@@ -1,7 +1,8 @@
{
- "description": "椤圭洰閰嶇疆鏂囦欢",
+ "description": "椤圭洰閰嶇疆鏂囦欢锛岃瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"packOptions": {
- "ignore": []
+ "ignore": [],
+ "include": []
},
"setting": {
"urlCheck": false,
@@ -37,37 +38,22 @@
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
- "minifyWXSS": true
+ "minifyWXSS": true,
+ "lazyloadPlaceholderEnable": false,
+ "useStaticServer": true,
+ "showES6CompileOption": false,
+ "disableUseStrict": false,
+ "useCompilerPlugins": false
},
"compileType": "miniprogram",
"libVersion": "2.12.0",
"appid": "wxe17f21bb8de42202",
"projectname": "GoldenChicken",
- "debugOptions": {
- "hidedInDevtools": []
- },
- "scripts": {},
- "isGameTourist": false,
"simulatorType": "wechat",
"simulatorPluginLibVersion": {},
- "condition": {
- "search": {
- "list": []
- },
- "conversation": {
- "list": []
- },
- "game": {
- "list": []
- },
- "plugin": {
- "list": []
- },
- "gamePlugin": {
- "list": []
- },
- "miniprogram": {
- "list": []
- }
+ "condition": {},
+ "editorSetting": {
+ "tabIndent": "insertSpaces",
+ "tabSize": 2
}
}
\ No newline at end of file
diff --git a/GoldC/project.private.config.json b/GoldC/project.private.config.json
new file mode 100644
index 0000000..e41d039
--- /dev/null
+++ b/GoldC/project.private.config.json
@@ -0,0 +1,7 @@
+{
+ "projectname": "GoldenChicken",
+ "setting": {
+ "compileHotReLoad": true
+ },
+ "description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+}
\ No newline at end of file
--
Gitblit v1.8.0