From bcefd591a0e14055f40cbbf90e4eb06576b8ad46 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 03 Nov 2021 20:59:47 +0800
Subject: [PATCH] 菜单调整
---
pages/grabOrders/feedback.vue | 12 ++++++------
pages/registerUser/idphoto.nvue | 3 ++-
pages/grabOrders/grabOrders.vue | 4 ++--
pages/grabOrders/map.vue | 2 +-
grabOrdersMap/js/vueMain.js | 4 ++--
pages.json | 2 +-
store/state.js | 4 ++--
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/grabOrdersMap/js/vueMain.js b/grabOrdersMap/js/vueMain.js
index f8cac75..cb7f94f 100644
--- a/grabOrdersMap/js/vueMain.js
+++ b/grabOrdersMap/js/vueMain.js
@@ -63,8 +63,8 @@
} else {
//抢单
// console.log(this.data)
- let up = this.data.appenUrl == '/api' ? "http://192.168.0.107:85" : this.data.appenUrl;
- let url = up + "/taskqd/Graborder",
+ // let up = this.data.appenUrl == '/api' ? "http://192.168.0.107:85" : this.data.appenUrl;
+ let url = "http://223.82.109.183:2082/api" + "/taskqd/Graborder",
dataAppend = this.data;
axios.post(url, dataAppend).then(res => {
console.log(res);
diff --git a/pages.json b/pages.json
index 532b3b1..85871a6 100644
--- a/pages.json
+++ b/pages.json
@@ -331,7 +331,7 @@
"path": "pages/grabOrders/grabOrders",
"name": "grabOrders",
"style": {
- "navigationBarTitleText": "我要抢",
+ "navigationBarTitleText": "我参与",
"navigationBarBackgroundColor": "#103289",
"navigationBarTextStyle": "white"
}
diff --git a/pages/grabOrders/feedback.vue b/pages/grabOrders/feedback.vue
index 3a67f99..0abc762 100644
--- a/pages/grabOrders/feedback.vue
+++ b/pages/grabOrders/feedback.vue
@@ -9,16 +9,16 @@
</u-navbar>
</view> -->
<view class="mapJQtijiaomain">
- <view class="title" style="padding-top: 0.5rem;">请输入活动心得:</view>
+ <view class="title" style="padding-top: 0.5rem;">请输入任务心得:</view>
<view class="f">
<view class="main" style="margin:0 1rem;">
- <textarea rows="9" cols="27" placeholder="请输入活动心得。" v-model="longInputD"></textarea>
+ <textarea rows="9" cols="27" placeholder="请输入任务心得。" v-model="longInputD"></textarea>
</view>
</view>
- <view class="title" style="padding-top: 0.5rem;">请输入我的意见:</view>
+ <view class="title" style="padding-top: 0.5rem;">请输入任务意见:</view>
<view class="f">
<view class="main" style="margin:0 1rem;">
- <textarea rows="9" cols="27" placeholder="请输入我的意见。" v-model="longInputD1"></textarea>
+ <textarea rows="9" cols="27" placeholder="请输入任务意见。" v-model="longInputD1"></textarea>
</view>
</view>
<view class="title">照片上传:</view>
@@ -171,7 +171,7 @@
for (var i = 0; i < tempFilePath.length; i++) {
wx.uploadFile({
// url: 'https://web.byisf.com/api/depl/put-depl', //仅为示例，非真实的接口地址
- url: 'http://web.byisf.com:82/blade-jfpts/depl/put-depl',
+ url: that.$store.state.piAPI+'/depl/put-depl',
filePath: tempFilePath[i],
name: 'file',
formData: {
@@ -221,7 +221,7 @@
})
wx.uploadFile({
// url: 'https://web.byisf.com/api/depl/put-depl', //仅为示例，非真实的接口地址
- url: 'http://web.byisf.com:82/blade-jfpts/depl/put-depl',
+ url: that.$store.state.piAPI+'/depl/put-depl',
filePath: tempFilePath,
name: 'file',
formData: {
diff --git a/pages/grabOrders/grabOrders.vue b/pages/grabOrders/grabOrders.vue
index 6933812..0529408 100644
--- a/pages/grabOrders/grabOrders.vue
+++ b/pages/grabOrders/grabOrders.vue
@@ -11,7 +11,7 @@
<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="onreachBottom">
<page0 :listData="listData0" :swiperCurrent="swiperCurrent" v-if="item.name == '正在进行'"
@openOnce="openOnce" @getOrders="getOrders"></page0>
- <page1 :listData="listData1" :swiperCurrent="swiperCurrent" v-if="item.name == '抢单池'"
+ <page1 :listData="listData1" :swiperCurrent="swiperCurrent" v-if="item.name == '可参与'"
@openOnce="openOnce" @getOrders="getOrders"></page1>
<!-- <view class="once" v-for="(item,index) in listData" :key="index" @click="openOnce(item)">
<view class="onve-left">
@@ -60,7 +60,7 @@
list: [{
name: '正在进行'
}, {
- name: '抢单池'
+ name: '可参与'
}],
// 因为内部的滑动机制限制，请将tabs组件和swiper组件的current用不同变量赋值
current: 0, // tabs组件的current值，表示当前活动的tab选项
diff --git a/pages/grabOrders/map.vue b/pages/grabOrders/map.vue
index 5b4cb8d..cff20c2 100644
--- a/pages/grabOrders/map.vue
+++ b/pages/grabOrders/map.vue
@@ -30,7 +30,7 @@
// console.log(a)
// let a = "grabOrdersMap/xcxmap.html";
// this.urls = "http://223.82.109.183:2082/" + a + "?data=" + data;
- this.urls = "http://127.0.0.1:8848/qfqk-android/grabOrdersMap/xcxmap.html?data=" + data;
+ this.urls = "http://223.82.109.183:2082/grabOrdersMap/xcxmap.html?data=" + data;
// http://127.0.0.1:8848/qfqk-android/grabOrdersMap/xcxmap.html
// this.dataList = data;
// console.log(this.urls);
diff --git a/pages/registerUser/idphoto.nvue b/pages/registerUser/idphoto.nvue
index 24ad00f..450aedb 100644
--- a/pages/registerUser/idphoto.nvue
+++ b/pages/registerUser/idphoto.nvue
@@ -226,7 +226,8 @@
username: d.user,
deptid:d.objId,
parentId:d.jsid,
- jurisdiction:d.xqobjId
+ jurisdiction:d.xqobjId,
+ cardid:d.carId
}
uni.request({
url: url,
diff --git a/store/state.js b/store/state.js
index 638ed61..cadd63c 100644
--- a/store/state.js
+++ b/store/state.js
@@ -4,9 +4,9 @@
useName: '过客',
},
logPath: '',
- // piAPI: 'http://223.82.109.183:2082/api/',
+ piAPI: 'http://223.82.109.183:2082/api/',
// piAPI: 'http://192.168.0.107:85', //唐
- piAPI: '/api', //本地转发
+ // piAPI: '/api', //本地转发
//piAPI: 'http://s16s652780.51mypc.cn/api/',
//piAPI: 'http://192.168.0.113:83/',
//piAPI: 'http://192.168.0.111:83/',
--
Gitblit v1.9.3