From 8fbb2c72179870117ee1e7b3cbfd8d53cbd157a1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 19:08:02 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai
---
small-program/components/sunui-mverify/sunui-mverify.vue | 2
small-program/pages/mine/mine.vue | 1
small-program/pages/employment-certification/employment-certification.vue | 474 ++++++++++-------
small-program/utils/http.interceptor.js | 2
small-program/store/index.js | 11
small-program/App.vue | 61 +
small-program/pages/demand-hall/demand-hall.vue | 831 +++++++++++++++++++------------
small-program/pages/index/index.vue | 142 +++-
8 files changed, 942 insertions(+), 582 deletions(-)
diff --git a/small-program/App.vue b/small-program/App.vue
index 1ed19d8..9bfe61a 100644
--- a/small-program/App.vue
+++ b/small-program/App.vue
@@ -12,30 +12,61 @@
success: async function (loginRes) {
let { code } = loginRes;
let res = await that.$u.api.wxLogin({ code })
- if (res&& res.code === 200) {
+ if (res && res.code === 200) {
that.$store.commit('setToken', res.data.token)
that.$store.commit('setOpenid', res.data.openid)
that.$store.commit('setUserInfo', res.data.member)
- that.$isResolve()
+ uni.getLocation({
+ type: 'wgs84',
+ success: (addr) => {
+ that.$store.commit('setPosition', { latitude: addr.latitude, longitude: addr.longitude })
+ that.$isResolve()
+ },
+ fail: (err) => {
+ console.error('鑾峰彇浣嶇疆澶辫触', err);
+ that.$isResolve()
+ }
+ });
+
}
}
});
- }
+ } else {
+ var that = this
+ let res = this.$u.api.getMemberInfo({}).then(res =>{
+ if (res && res.code === 200) {
+ that.$store.commit('setUserInfo', res.data)
+ uni.getLocation({
+ type: 'wgs84',
+ success: (addr) => {
+ that.$store.commit('setPosition', { latitude: addr.latitude, longitude: addr.longitude })
+ that.$isResolve()
+ },
+ fail: (err) => {
+ console.error('鑾峰彇浣嶇疆澶辫触', err);
+ that.$isResolve()
+ }
+ });
+ } else {
+ that.$store.commit('setToken','')
+ that.$store.commit('setUserInfo',{})
+ uni.getLocation({
+ type: 'wgs84',
+ success: (addr) => {
+ that.$store.commit('setPosition', { latitude: addr.latitude, longitude: addr.longitude })
+ that.$isResolve()
+ },
+ fail: (err) => {
+ console.error('鑾峰彇浣嶇疆澶辫触', err);
+ that.$isResolve()
+ }
+ });
+ }
+ })
+ }
},
onShow: function() {
console.log('App Show')
- var that =this
- let res = this.$u.api.getMemberInfo({}).then(res =>{
- if (res && res.code ===200) {
- that.$store.commit('setUserInfo', res.data)
- that.$isResolve()
- }else{
- that.$store.commit('setToken','')
- that.$store.commit('setUserInfo',{})
- that.$isResolve()
- }
- })
-
},
onHide: function() {
console.log('App Hide')
diff --git a/small-program/components/sunui-mverify/sunui-mverify.vue b/small-program/components/sunui-mverify/sunui-mverify.vue
index 3ddbbcd..d27f0a2 100644
--- a/small-program/components/sunui-mverify/sunui-mverify.vue
+++ b/small-program/components/sunui-mverify/sunui-mverify.vue
@@ -1,7 +1,7 @@
<template name='sunui-mverify'>
<view class="sunui-slider">
<text style="color: #FFFFFF;">{{ hint }}</text>
- <view class='sunui-slider-bg' :style="{left:-(w + 2)+'px',transform:cssAnimation}">
+ <view class='sunui-slider-bg' :style="{left:-(w + 5)+'px',transform:cssAnimation}">
<text>{{ succeedMsg }}</text>
<view class='sunui-slider-box' @touchmove='moveStart' @touchend='moveEnd'>
<image src="/static/icon/ic_huakuai@2x.png" mode="widthFix"></image>
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index 2e0e331..7503f8a 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -6,278 +6,276 @@
<text>鎴戠殑璁㈠崟</text>
</view>
</view>
- <!-- 鍙戝崟鏂� -->
- <view class="index-labs" v-if="type === 0" :style="{ top: statusbarHeight + navHeight + 'px' }">
- <view class="index-labs-row">
- 鍏ㄩ儴
- <view class="index-labs-row-x"></view>
- </view>
- <view class="index-labs-row active">寰呮帴鍗�</view>
- <view class="index-labs-row">宸叉帴鍗�</view>
- <view class="index-labs-row">杩涜涓�</view>
- <view class="index-labs-row">寰呰瘎浠�</view>
- <view class="index-labs-row">宸插彇娑�</view>
- </view>
- <!-- 鎺ュ崟鏂� -->
- <view class="index-labs" v-if="type === 1" :style="{ top: statusbarHeight + navHeight + 'px' }">
- <view class="index-labs-row">
- 鍏ㄩ儴
- <view class="index-labs-row-x"></view>
- </view>
- <view class="index-labs-row active">宸叉帴鍗�</view>
- <view class="index-labs-row">杩涜涓�</view>
- <view class="index-labs-row">宸插畬鎴�</view>
- <view class="index-labs-row">宸插彇娑�</view>
- </view>
- <!-- 鍙戝崟鏂� -->
- <view class="index-list" v-if="type === 0">
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>璁㈤鍗�</text>
- </view>
- <view class="index-list-item-head-r">寰呮帴鍗曟柟鎺ュ崟</view>
- </view>
- <view class="index-list-item-info">
- 鍗堥5鍏�(30浠�)锝滄櫄椁�8鍏�(20浠�)
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view></view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>杩愯揣鍗�-灏忚揣杞�-鍘㈠紡</text>
- </view>
- <view class="index-list-item-head-r">寰呮帴鍗曟柟鎺ュ崟</view>
- </view>
- <view class="index-list-item-info">
- 钁¤悇锝�20000鏂わ綔闇�2杈�
- </view>
- <view class="index-list-item-date">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="address">
- <view class="address-xian"></view>
- <view class="address-row">
- <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="address-row">
- <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥笢闂ㄤ繚瀹夊</text>
- </view>
- <view class="address-row">
- <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
- <text>瀹夊窘鑾茶姳绉戞妧浜т笟鍥眴绫崇鎶�鏈夐檺鍏徃</text>
- </view>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view></view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>鐢ㄥ伐鍗�-閲囨憳宸�</text>
- </view>
- <view class="index-list-item-head-r">寰呮帴鍗�</view>
- </view>
- <view class="index-list-item-info">
- 钁¤悇锝�2000鏂�
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view></view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- </view>
- <!-- 鎺ュ崟鏂� -->
- <view class="index-list" v-if="type === 1">
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>璁㈤鍗�</text>
- <view class="tips">绯荤粺娲惧崟</view>
- </view>
- <view class="index-list-item-head-r">宸叉帴鍗�</view>
- </view>
- <view class="index-list-item-info">
- 鍗堥5鍏�(30浠�)锝滄櫄椁�8鍏�(20浠�)
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view class="eidt-tips">
- <image src="/static/icon/ic_tip@2x.png" mode="widthFix"></image>
- <text>璁㈠崟宸蹭慨鏀�</text>
- </view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>杩愯揣鍗�-灏忚揣杞�-鍘㈠紡</text>
- <view class="tips1">鑷富鎶㈠崟</view>
- </view>
- <view class="index-list-item-head-r">宸叉帴鍗�</view>
- </view>
- <view class="index-list-item-info">
- 钁¤悇锝�20000鏂わ綔闇�2杈�
- </view>
- <view class="index-list-item-date">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="address">
- <view class="address-xian"></view>
- <view class="address-row">
- <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="address-row">
- <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥笢闂ㄤ繚瀹夊</text>
- </view>
- <view class="address-row">
- <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
- <text>瀹夊窘鑾茶姳绉戞妧浜т笟鍥眴绫崇鎶�鏈夐檺鍏徃</text>
- </view>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view></view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- <view class="index-list-item">
- <view class="index-list-item-head">
- <view class="index-list-item-head-l">
- <view class="xoam"></view>
- <text>鐢ㄥ伐鍗�-閲囨憳宸�</text>
- <view class="tips1">鑷富鎶㈠崟</view>
- </view>
- <view class="index-list-item-head-r">寰呮帴鍗�</view>
- </view>
- <view class="index-list-item-info">
- 钁¤悇锝�2000鏂�
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
- </view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>07-26 鑷� 07-27锛�2澶╋級</text>
- </view>
- <view class="index-list-item-price">
- <text>棰勪及锛�</text>
- <text>楼1000.00</text>
- </view>
- <view class="eidt">
- <view></view>
- <view class="eidt-right">
- <view class="eidt-close">鍙栨秷璁㈠崟</view>
- <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
- <view class="eidt-phone">鑱旂郴甯堝倕</view>
- <view class="eidt-phone">璇勪环璁㈠崟</view>
- <view class="eidt-btn">淇敼璁㈠崟</view>
- <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
- </view>
- </view>
- </view>
- </view>
- <!-- <view class="index-wu">
+
+ <!-- 鏈櫥褰� -->
+ <view class="index-wu" v-if="!isLogin">
<image src="/static/icon/default_login@2x.png" mode="widthFix"></image>
<text>鎮ㄨ繕娌℃湁鐧诲綍锛岃鐧诲綍鍚庢煡鐪嬭鍗�</text>
<button>鐧诲綍</button>
- </view> -->
+ </view>
+
+ <!-- 宸茬櫥闄� -->
+ <template v-else>
+ <!-- 鍙戝崟鏂� -->
+ <view class="index-labs" v-if="typeViewId === 0" :style="{ top: statusbarHeight + navHeight + 'px' }">
+ <scroll-view scroll-x class="scroll-view_H">
+ <view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list1" :key="index" @click="clickOrderType(item.id)">
+ {{item.name}}
+ <view class="index-labs-row-x" v-if="item.id === status"></view>
+ </view>
+ </scroll-view>
+ </view>
+ <!-- 鎺ュ崟鏂� -->
+ <view class="index-labs" v-if="typeViewId === 1" :style="{ top: statusbarHeight + navHeight + 'px' }">
+ <scroll-view scroll-x class="scroll-view_H">
+ <view :class="item.id === status ? 'index-labs-row active' : 'index-labs-row'" v-for="(item, index) in list" :key="index" @click="clickOrderType(item.id)">
+ {{item.name}}
+ <view class="index-labs-row-x" v-if="item.id === status"></view>
+ </view>
+ </scroll-view>
+ </view>
+ <!-- 鍙戝崟鏂� -->
+ <view class="index-list" v-if="typeViewId === 0">
+ <view class="index-list-item" v-for="(item, index) in orderList" :key="index">
+ <view class="index-list-item-head">
+ <view class="index-list-item-head-l">
+ <view class="xoam"></view>
+ <text v-if="item.type === 0 && item.workType === 0">鐢ㄥ伐鍗� - 閲囨憳宸�</text>
+ <text v-else-if="item.type === 0 && item.workType === 1">鐢ㄥ伐鍗� - 鍒嗘嫞宸�</text>
+ <text v-else-if="item.type === 0 && item.workType === 2">鐢ㄥ伐鍗� - 鍖呰宸�</text>
+ <text v-else-if="item.type === 1">杩愯揣鍗�-{{item.categoryName}}-{{item.carUnit}}</text>
+ <text v-else-if="item.type === 2">璁㈤鍗�</text>
+ </view>
+ <view class="index-list-item-head-r" v-if="item.status === 1">寰呮帴鍗曟柟鎺ュ崟</view>
+ <view class="index-list-item-head-r" v-if="item.status === 2">宸叉帴鍗�</view>
+ <view class="index-list-item-head-r" v-if="item.status === 3">杩涜涓�</view>
+ <view class="index-list-item-head-r" v-if="item.status === 2 && item.isUpdate === 1">宸蹭慨鏀癸紝寰呮帴鍗曟柟纭</view>
+ <view class="index-list-item-head-r hui" v-if="item.status === 4">宸插畬鎴�</view>
+ <view class="index-list-item-head-r hui" v-if="item.status === 99">宸插彇娑�</view>
+ <view class="index-list-item-head-r" v-if="item.status === 4 && item.commentStatus === 0">寰呰瘎浠�</view>
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0">
+ {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
+ {{item.categoryName}}锝渰{item.priceNum1}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
+ {{item.categoryName}}锝渰{item.priceNum1}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 1">
+ {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 2">
+ {{item.wayInfoCopy}}
+ </view>
+ <view class="address" v-if="item.type === 1">
+ <view class="address-xian"></view>
+ <view class="address-row" v-for="(address, i) in item.wayInfo" :key="i">
+ <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
+ <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
+ <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
+ <text>{{item.location}}</text>
+ </view>
+ </view>
+ <template v-if="[0, 2].includes(item.type)">
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
+ <text>{{item.location}}</text>
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.priceNum1}}澶╋級</text>
+ </view>
+ </template>
+ <view class="index-list-item-price">
+ <text>棰勪及锛�</text>
+ <text>楼{{item.estimatedAccount / 100}}</text>
+ </view>
+ <view class="eidt">
+ <view></view>
+ <view class="eidt-right">
+ <view class="eidt-close" v-if="[0,1,2].includes(item.status)" @click="orderId = item.id, show = true">鍙栨秷璁㈠崟</view>
+ <view class="eidt-phone" v-if="[2].includes(item.status)">鑱旂郴甯堝倕</view>
+ <view class="eidt-phone" v-if="item.status === 4 && item.commentStatus === 0">璇勪环璁㈠崟</view>
+ <view class="eidt-btn" v-if="[0,1,2].includes(item.status)" @click="jumpEdit(item)">淇敼璁㈠崟</view>
+ <view class="eidt-btn" v-if="(item.type === 2 && item.status === 0) || (item.type === 2 && item.status === 3)" @click="jumpEdit(item)">缁х画鏀粯</view>
+ <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
+ <view class="eidt-phone">鑱旂郴甯堝倕</view>
+ <view class="eidt-phone">璇勪环璁㈠崟</view>
+ <view class="eidt-btn">淇敼璁㈠崟</view>
+ <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
+ </view>
+ </view>
+ </view>
+ </view>
+ <!-- 鎺ュ崟鏂� -->
+ <view class="index-list" v-if="typeViewId === 1">
+ <view class="index-list-item" v-for="(item, index) in orderList" :key="index">
+ <view class="index-list-item-head">
+ <view class="index-list-item-head-l">
+ <view class="xoam"></view>
+ <text v-if="item.type === 0 && item.workType === 0">鐢ㄥ伐鍗� - 閲囨憳宸�</text>
+ <text v-else-if="item.type === 0 && item.workType === 1">鐢ㄥ伐鍗� - 鍒嗘嫞宸�</text>
+ <text v-else-if="item.type === 0 && item.workType === 2">鐢ㄥ伐鍗� - 鍖呰宸�</text>
+ <text v-else-if="item.type === 1">杩愯揣鍗�-{{item.categoryName}}-{{item.carUnit}}</text>
+ <text v-else-if="item.type === 2">璁㈤鍗�</text>
+ <view class="tips" v-if="item.acceptType === 1">绯荤粺娲惧崟</view>
+ <view class="tips1" v-if="item.acceptType === 0">鎵嬪姩鎺ュ崟</view>
+ </view>
+ <view class="index-list-item-head-r" v-if="item.status === 2">宸叉帴鍗�</view>
+ <view class="index-list-item-head-r" v-if="item.status === 3">杩涜涓�</view>
+ <view class="index-list-item-head-r hui" v-if="item.status === 4">宸插畬鎴�</view>
+ <view class="index-list-item-head-r hui" v-if="item.status === 99">宸插彇娑�</view>
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 0">
+ {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
+ {{item.categoryName}}锝渰{item.priceNum1}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
+ {{item.categoryName}}锝渰{item.priceNum1}}浜�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 1">
+ {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
+ </view>
+ <view class="index-list-item-info" v-if="item.type === 2">
+ {{item.wayInfoCopy}}
+ </view>
+ <view class="address" v-if="item.type === 1">
+ <view class="address-xian"></view>
+ <view class="address-row" v-for="(address, i) in item.wayInfo" :key="i">
+ <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
+ <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
+ <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
+ <text>{{item.location}}</text>
+ </view>
+ </view>
+ <template v-if="[0, 2].includes(item.type)">
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
+ <text>{{item.location}}</text>
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.priceNum1}}澶╋級</text>
+ </view>
+ </template>
+ <view class="index-list-item-price">
+ <text>棰勪及锛�</text>
+ <text>楼{{item.estimatedAccount / 100}}</text>
+ </view>
+ <view class="eidt">
+ <view class="eidt-tips" v-if="item.isUpdate === 1">
+ <image src="/static/icon/ic_tip@2x.png" mode="widthFix"></image>
+ <text>璁㈠崟宸蹭慨鏀�</text>
+ </view>
+ <view class="eidt-tips" v-else></view>
+
+ <view class="eidt-right">
+ <view class="eidt-close" v-if="item.status === 2" @click="orderId = item.id, show = true">鍙栨秷璁㈠崟</view>
+ <view class="eidt-phone" v-if="[2,3].includes(item.status)" @click="phoneCall(item.linkPhone)">鑱旂郴涓氫富</view>
+
+ <!-- <view class="eidt-close">鍒犻櫎璁㈠崟</view>
+ <view class="eidt-phone">鑱旂郴甯堝倕</view>
+ <view class="eidt-phone">璇勪环璁㈠崟</view>
+ <view class="eidt-btn">淇敼璁㈠崟</view>
+ <view class="eidt-btn">瀹屾垚骞舵敮浠�</view> -->
+ </view>
+ </view>
+ </view>
+ <!-- <view class="index-list-item">
+ <view class="index-list-item-head">
+ <view class="index-list-item-head-l">
+ <view class="xoam"></view>
+ <text>杩愯揣鍗�-灏忚揣杞�-鍘㈠紡</text>
+ <view class="tips1">鑷富鎶㈠崟</view>
+ </view>
+ <view class="index-list-item-head-r">宸叉帴鍗�</view>
+ </view>
+ <view class="index-list-item-info">
+ 钁¤悇锝�20000鏂わ綔闇�2杈�
+ </view>
+ <view class="index-list-item-date">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>07-26 鑷� 07-27锛�2澶╋級</text>
+ </view>
+ <view class="address">
+ <view class="address-xian"></view>
+ <view class="address-row">
+ <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
+ <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
+ </view>
+ <view class="address-row">
+ <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
+ <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥笢闂ㄤ繚瀹夊</text>
+ </view>
+ <view class="address-row">
+ <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
+ <text>瀹夊窘鑾茶姳绉戞妧浜т笟鍥眴绫崇鎶�鏈夐檺鍏徃</text>
+ </view>
+ </view>
+ <view class="index-list-item-price">
+ <text>棰勪及锛�</text>
+ <text>楼1000.00</text>
+ </view>
+ <view class="eidt">
+ <view></view>
+ <view class="eidt-right">
+ <view class="eidt-close">鍙栨秷璁㈠崟</view>
+ </view>
+ </view>
+ </view> -->
+ <!-- <view class="index-list-item">
+ <view class="index-list-item-head">
+ <view class="index-list-item-head-l">
+ <view class="xoam"></view>
+ <text>鐢ㄥ伐鍗�-閲囨憳宸�</text>
+ <view class="tips1">鑷富鎶㈠崟</view>
+ </view>
+ <view class="index-list-item-head-r">寰呮帴鍗�</view>
+ </view>
+ <view class="index-list-item-info">
+ 钁¤悇锝�2000鏂�
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
+ <text>闀挎睙瑗胯矾澶ц渶灞辨．鏋楀叕鍥タ闂ㄤ繚瀹夊</text>
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>07-26 鑷� 07-27锛�2澶╋級</text>
+ </view>
+ <view class="index-list-item-price">
+ <text>棰勪及锛�</text>
+ <text>楼1000.00</text>
+ </view>
+ <view class="eidt">
+ <view></view>
+ <view class="eidt-right">
+ <view class="eidt-close">鍙栨秷璁㈠崟</view>
+ </view>
+ </view>
+ </view> -->
+ </view>
+ </template>
+
+ <u-modal
+ title="娓╅Θ鎻愮ず"
+ :show="show"
+ closeOnClickOverlay
+ showCancelButton
+ >
+ <view class="slot-content">
+ 纭鍙栨秷璁㈠崟鍚楋紵
+ </view>
+ <view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
+ <view class="btn1" @click="show = false">鎴戝啀鎯虫兂</view>
+ <view class="btn2" @click="cancelOrder">纭鍙栨秷</view>
+ </view>
+ </u-modal>
+
</view>
</template>
@@ -285,12 +283,143 @@
import { mapState } from 'vuex'
export default {
computed: {
- ...mapState(['navHeight', 'statusbarHeight'])
+ ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid', 'latitude', 'longitude'])
+ },
+ onShow(options) {
+ this.typeViewId = 0
+ if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
+ this.isLogin = true
+ }
+ if (this.userInfo && this.userInfo.useIdentity == 1) {
+ this.typeViewId = 1
+ } else {
+ this.typeViewId = 0
+ }
},
data() {
return {
- type: 1
+ show: false,
+ isLogin: false,
+ typeViewId: 0,
+ list: [
+ { name: '鍏ㄩ儴', id: '' },
+ { name: '宸叉帴鍗�', id: 2 },
+ { name: '杩涜涓�', id: 3 },
+ { name: '宸插畬鎴�', id: 4 },
+ { name: '宸插彇娑�', id: 99 },
+ ],
+ list1: [
+ { name: '鍏ㄩ儴', id: '' },
+ { name: '寰呮敮浠�', id: 0 },
+ { name: '寰呮帴鍗�', id: 1 },
+ { name: '宸叉帴鍗�', id: 2 },
+ { name: '杩涜涓�', id: 3 },
+ { name: '宸插畬鎴�', id: 4 },
+ { name: '宸插彇娑�', id: 99 },
+ { name: '寰呰瘎浠�', id: [4, 0] }
+ ],
+ orderId: null,
+ status: '',
+ commentStatus: '',
+
+ next: true,
+ page: 1,
+ orderList: []
};
+ },
+ async onLoad() {
+ await this.$onLaunched;
+ uni.$on('refresh', (data) => {
+ console.log('鎴戠殑璁㈠崟椤靛埛鏂�');
+ this.status = ''
+ this.commentStatus = ''
+ this.orderList = []
+ this.next = true
+ this.page = 1
+ this.getOrderList()
+ })
+ this.getOrderList()
+ },
+ onReachBottom() {
+ this.getOrderList()
+ },
+ methods: {
+ // 淇敼
+ jumpEdit(item) {
+ if (item.type === 0 && item.workType === 0) {
+ uni.navigateTo({
+ url: `/pages/using-workers/using-workers?id=${item.id}`
+ })
+ } else if (item.type === 0 && item.workType === 1) {
+ uni.navigateTo({
+ url: `/pages/sorting/sorting?id=${item.id}`
+ })
+ } else if (item.type === 0 && item.workType === 2) {
+ uni.navigateTo({
+ url: `/pages/packaging-worker/packaging-worker?id=${item.id}`
+ })
+ }
+ },
+ cancelOrder() {
+ this.$u.api.receiveCancelOrder({
+ orderId: this.orderId
+ }).then(res => {
+ this.show = false
+ this.orderList = []
+ this.next = true
+ this.page = 1
+ this.getOrderList()
+ })
+ },
+ phoneCall(phoneNumber) {
+ uni.makePhoneCall({
+ phoneNumber
+ });
+ },
+ // 璁㈠崟鍒嗛〉
+ getOrderList() {
+ if (!this.next) return;
+ this.$u.api.orderPage({
+ capacity: 10,
+ page: this.page,
+ model: {
+ queryMyOrderType: this.userInfo.useIdentity,
+ status: this.status,
+ queryLat: this.latitude,
+ queryLgt: this.longitude
+ }
+ }).then(res => {
+ res.data.records.forEach(item => {
+ // 璁㈤鍗�
+ if (item.type === 2) {
+ item.wayInfoCopy = JSON.parse(item.wayInfo).map(item => {
+ return `${item.name}${item.price / 100}鍏�(${item.num}浠�)`
+ }).join(' | ')
+ // 杩愯揣
+ } else if (item.type === 1) {
+ item.wayInfo = JSON.parse(item.wayInfo)
+ }
+ })
+ this.orderList = [...this.orderList, ...res.data.records]
+
+ if (this.orderList.length === res.data.total) {
+ this.next = false
+ }
+ })
+ },
+ clickOrderType(id) {
+ if (typeof id === 'object') {
+ this.status = id[0]
+ this.commentStatus = id[1]
+ } else {
+ this.commentStatus = ''
+ this.status = id
+ }
+ this.orderList = []
+ this.next = true
+ this.page = 1
+ this.getOrderList()
+ }
}
}
</script>
@@ -304,6 +433,36 @@
<style lang="scss" scoped>
.index {
width: 100%;
+ .slot-content {
+ width: 100%;
+ text-align: center;
+ font-weight: 400;
+ font-size: 30rpx;
+ color: #333333;
+ margin: 30rpx 0;
+ }
+ .btn1 {
+ width: 264rpx;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ font-weight: 400;
+ font-size: 32rpx;
+ color: #666666;
+ border-radius: 44rpx;
+ border: 1rpx solid #B2B2B2;
+ }
+ .btn2 {
+ width: 264rpx;
+ height: 88rpx;
+ line-height: 88rpx;
+ text-align: center;
+ font-weight: 500;
+ font-size: 32rpx;
+ color: #FFFFFF;
+ background: #00BC12;
+ border-radius: 44rpx;
+ }
.index-j-head {
width: 100%;
background-color: #ffffff;
@@ -358,38 +517,47 @@
color: #FF0000;
}
}
- .eidt-close {
- width: 160rpx;
- height: 64rpx;
- font-weight: 400;
- font-size: 28rpx;
- color: #666666;
- line-height: 64rpx;
- text-align: center;
- border-radius: 34rpx;
- border: 1rpx solid #B2B2B2;
- }
- .eidt-phone {
- width: 160rpx;
- height: 64rpx;
- line-height: 64rpx;
- text-align: center;
- font-weight: 400;
- font-size: 28rpx;
- color: #00BC12;
- border-radius: 34rpx;
- border: 1rpx solid #00BC12;
- }
- .eidt-btn {
- width: 160rpx;
- height: 64rpx;
- line-height: 64rpx;
- text-align: center;
- font-weight: 400;
- font-size: 28rpx;
- color: #FFFFFF;
- background: #00BC12;
- border-radius: 34rpx;
+ .eidt-right {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ .eidt-close {
+ width: 160rpx;
+ height: 64rpx;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #666666;
+ line-height: 64rpx;
+ text-align: center;
+ border-radius: 34rpx;
+ border: 1rpx solid #B2B2B2;
+ margin-left: 20rpx;
+ }
+ .eidt-phone {
+ width: 160rpx;
+ height: 64rpx;
+ line-height: 64rpx;
+ text-align: center;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #00BC12;
+ border-radius: 34rpx;
+ border: 1rpx solid #00BC12;
+ margin-left: 20rpx;
+ }
+ .eidt-btn {
+ width: 160rpx;
+ height: 64rpx;
+ line-height: 64rpx;
+ text-align: center;
+ font-weight: 400;
+ font-size: 28rpx;
+ color: #FFFFFF;
+ background: #00BC12;
+ border-radius: 34rpx;
+ margin-left: 20rpx;
+ }
}
}
.index-list-item-price {
@@ -530,6 +698,9 @@
border: 2rpx solid #FD9E24;
}
}
+ .hui {
+ color: #999999 !important;
+ }
.index-list-item-head-r {
font-weight: 400;
font-size: 28rpx;
@@ -541,35 +712,43 @@
.index-labs {
width: 100%;
height: 90rpx;
+ padding: 0 30rpx;
+ box-sizing: border-box;
display: flex;
align-items: center;
- justify-content: space-between;
background: #FFFFFF;
position: sticky;
left: 0;
- .active {
- font-weight: 500 !important;
- font-size: 32rpx !important;
- color: #222222 !important;
- }
- .index-labs-row {
- flex: 1;
+ .scroll-view_H {
+ width: 100%;
height: 100%;
- display: flex;
- align-items: center;
- justify-content: center;
- font-weight: 400;
- font-size: 30rpx;
- color: #666666;
- position: relative;
- .index-labs-row-x {
- position: absolute;
- bottom: 0;
- left: 50%;
- width: 40rpx;
- height: 2rpx;
- background-color: #00BC12;
- transform: translate(-50%, 0);
+ white-space: nowrap;
+ .active {
+ font-weight: 500 !important;
+ font-size: 32rpx !important;
+ color: #222222 !important;
+ }
+ .index-labs-row {
+ display: inline-block;
+ height: 100%;
+ line-height: 90rpx;
+ font-weight: 400;
+ font-size: 30rpx;
+ color: #666666;
+ position: relative;
+ margin-right: 62rpx;
+ &:last-child {
+ margin: 0 !important;
+ }
+ .index-labs-row-x {
+ position: absolute;
+ bottom: 0;
+ left: 50%;
+ width: 40rpx;
+ height: 2rpx;
+ background-color: #00BC12;
+ transform: translate(-50%, 0);
+ }
}
}
}
diff --git a/small-program/pages/employment-certification/employment-certification.vue b/small-program/pages/employment-certification/employment-certification.vue
index 7e4e3b2..61d1915 100644
--- a/small-program/pages/employment-certification/employment-certification.vue
+++ b/small-program/pages/employment-certification/employment-certification.vue
@@ -25,7 +25,7 @@
<input type="text" v-model="form.linkName" placeholder="璇疯緭鍏ョ湡瀹炲鍚�" />
</view>
</view>
- <view class="item" v-if="isCompany">
+ <view class="item" v-if="isCompany">
<view class="item-label">
<text>鍗曚綅鍚嶇О</text>
<text>*</text>
@@ -44,11 +44,11 @@
</view>
</view>
<view class="item" @click="chooseMPLoaction">
- <view class="item-label" >
+ <view class="item-label">
<text>鎺ュ崟浣嶇疆</text>
<text>*</text>
</view>
- <view class="item-val" >
+ <view class="item-val">
<text>{{form.location || '鍘婚�夋嫨'}}</text>
<u-icon name="arrow-right" color="#111111" size="18"></u-icon>
</view>
@@ -60,24 +60,27 @@
</view>
<view class="item-upload">
<view class="item-upload-item" @click="uploadImg(11)">
- <image v-if="form.img11Full && form.img11Full !=''" :src="form.img11Full" mode="widthFix"></image>
- <image v-else src="/static/image/btn_renxiang@2x.png" mode="widthFix"></image>
+ <image v-if="form.img11Full && form.img11Full !=''" :src="form.img11Full" mode="widthFix">
+ </image>
+ <image v-else src="/static/image/btn_renxiang@2x.png" mode="widthFix"></image>
</view>
- <view class="item-upload-item" @click="uploadImg(21)">
- <image v-if="form.img21Full && form.img21Full !=''" :src="form.img21Full" mode="widthFix"></image>
- <image v-else src="/static/image/btn_guohui@2x.png" mode="widthFix"></image>
+ <view class="item-upload-item" @click="uploadImg(21)">
+ <image v-if="form.img21Full && form.img21Full !=''" :src="form.img21Full" mode="widthFix">
+ </image>
+ <image v-else src="/static/image/btn_guohui@2x.png" mode="widthFix"></image>
</view>
</view>
</view>
- <view class="item" v-if="isCompany">
+ <view class="item" v-if="isCompany">
<view class="item-label">
<text>璁よ瘉璧勬枡</text>
<text>*</text>
</view>
<view class="item-upload" v-if="flag==0">
- <view class="item-upload-item1" @click="uploadImg(1)">
+ <view class="item-upload-item1" @click="uploadImg(1)">
<view class="image">
- <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix"></image>
+ <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
+ </image>
<image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
<text>鐐瑰嚮涓婁紶</text>
</view>
@@ -86,9 +89,10 @@
<text>*</text>
</view>
</view>
- <view class="item-upload-item1" @click="uploadImg(2)">
+ <view class="item-upload-item1" @click="uploadImg(2)">
<view class="image">
- <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix"></image>
+ <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
+ </image>
<image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
<text>鐐瑰嚮涓婁紶</text>
</view>
@@ -98,9 +102,10 @@
</view>
</view>
<view class="item-upload" v-if="flag==1">
- <view class="item-upload-item1" @click="uploadImg(1)">
+ <view class="item-upload-item1" @click="uploadImg(1)">
<view class="image">
- <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix"></image>
+ <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
+ </image>
<image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
<text>鐐瑰嚮涓婁紶</text>
</view>
@@ -109,9 +114,10 @@
<text>*</text>
</view>
</view>
- <view class="item-upload-item1" @click="uploadImg(2)">
+ <view class="item-upload-item1" @click="uploadImg(2)">
<view class="image">
- <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix"></image>
+ <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
+ </image>
<image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
<text>鐐瑰嚮涓婁紶</text>
</view>
@@ -120,9 +126,10 @@
<text>*</text>
</view>
</view>
- <view class="item-upload-item1" @click="uploadImg(3)">
+ <view class="item-upload-item1" @click="uploadImg(3)">
<view class="image">
- <image v-if="form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix"></image>
+ <image v-if="form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix">
+ </image>
<image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
<text>鐐瑰嚮涓婁紶</text>
</view>
@@ -132,9 +139,10 @@
</view>
</view>
<view class="item-upload" v-if="flag==2">
- <view class="item-upload-item1" @click="uploadImg(1)">
+ <view class="item-upload-item1" @click="uploadImg(1)">
<view class="image">
- <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix"></image>
+ <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
+ </image>
<image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
<text>鐐瑰嚮涓婁紶</text>
</view>
@@ -143,9 +151,10 @@
<text>*</text>
</view>
</view>
- <view class="item-upload-item1" @click="uploadImg(2)">
+ <view class="item-upload-item1" @click="uploadImg(2)">
<view class="image">
- <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix"></image>
+ <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
+ </image>
<image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
<text>鐐瑰嚮涓婁紶</text>
</view>
@@ -154,9 +163,10 @@
<text>*</text>
</view>
</view>
- <view class="item-upload-item1" @click="uploadImg(3)">
+ <view class="item-upload-item1" @click="uploadImg(3)">
<view class="image">
- <image v-if="form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix"></image>
+ <image v-if="form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix">
+ </image>
<image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
<text>鐐瑰嚮涓婁紶</text>
</view>
@@ -165,9 +175,10 @@
<text>*</text>
</view>
</view>
- <view class="item-upload-item1" @click="uploadImg(4)">
+ <view class="item-upload-item1" @click="uploadImg(4)">
<view class="image">
- <image v-if="form.img4Full && form.img4Full !=''" :src=" form.img4Full" mode="widthFix"></image>
+ <image v-if="form.img4Full && form.img4Full !=''" :src=" form.img4Full" mode="widthFix">
+ </image>
<image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
<text>鐐瑰嚮涓婁紶</text>
</view>
@@ -185,22 +196,29 @@
</template>
<script>
- import { mapState } from 'vuex'
+ import {
+ mapState
+ } from 'vuex'
export default {
computed: {
- ...mapState( ['userInfo'])
+ ...mapState(['userInfo'])
},
data() {
return {
bgImg: require('@/static/image/bg_renzheng_yonggong@2x.png'),
title: '鐢ㄦ埛璁よ瘉',
flag: null,
+<<<<<<< HEAD
+ isCompany: false,
+ loading: false,
+=======
isCompany:false,
loading:false,
info: {},
+>>>>>>> 66fcf61061d6d275c1848df5d3f8e0082f6b02ba
form: {
"companyName": "",
- authType:0,
+ authType: 0,
"img1": "",
"img2": "",
"img11": "",
@@ -217,153 +235,193 @@
"lat": null,
"lgt": null,
"linkName": "",
- "location": "",
+ "location": "",
"telephone": "",
- "type": 1
+ "type": 1
}
};
},
onLoad(options) {
console.log(options)
var flag = options.flag
- this.flag = flag
+ this.flag = flag
this.initFormData()
+<<<<<<< HEAD
+ switch (flag) {
+=======
this.getApplyData()
switch(flag){
+>>>>>>> 66fcf61061d6d275c1848df5d3f8e0082f6b02ba
case '1':
- this.title = '璐ц繍璁よ瘉'
+ this.title = '璐ц繍璁よ瘉'
this.bgImg = require('@/static/image/bg_renzheng_huoyun@2x.png')
break;
case '2':
- this.title = '渚涢璁よ瘉'
+ this.title = '渚涢璁よ瘉'
this.bgImg = require('@/static/image/bg_renzheng_gongcan@2x.png')
break;
default:
this.bgImg = require('@/static/image/bg_renzheng_yonggong@2x.png'),
- this.title = '鐢ㄥ伐璁よ瘉'
- break;
+ this.title = '鐢ㄥ伐璁よ瘉'
+ break;
}
uni.setNavigationBarTitle({
- title:this.title
+ title: this.title
})
},
- methods:{
- changeIsCompany(){
- this.isCompany =!this.isCompany
- this.form.authType = this.isCompany?1:0
+ methods: {
+ changeIsCompany() {
+ this.isCompany = !this.isCompany
+ this.form.authType = this.isCompany ? 1 : 0
},
- inNullParam(param){
- if(!param){
+ inNullParam(param) {
+ if (!param) {
return true
}
- if(param == ''){
+ if (param == '') {
return true
}
return false
},
applySubmit() {
- if(this.loading){
+ if (this.loading) {
return
}
- console.log('琛ㄥ崟鍙傛暟锛�',this.form)
- this.loading =true
- if(this.inNullParam(this.form.linkName)
- ||this.inNullParam(this.form.lat)
- ||this.inNullParam(this.form.lgt)
- ||this.inNullParam(this.form.location)
- ||this.inNullParam(this.form.telephone)){
- uni.showToast({title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅1锛�',icon: "none",duration: 2000});
- this.loading =false
- return
- }
- if( this.form.authType == 0){
- if(this.inNullParam(this.form.img11)||this.inNullParam(this.form.img21)){
- uni.showToast({title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅3锛�',icon: "none",duration: 2000});
- this.loading =false
+ console.log('琛ㄥ崟鍙傛暟锛�', this.form)
+ this.loading = true
+ if (this.inNullParam(this.form.linkName) ||
+ this.inNullParam(this.form.lat) ||
+ this.inNullParam(this.form.lgt) ||
+ this.inNullParam(this.form.location) ||
+ this.inNullParam(this.form.telephone)) {
+ uni.showToast({
+ title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅1锛�',
+ icon: "none",
+ duration: 2000
+ });
+ this.loading = false
return
- }
- }else{
- if(this.inNullParam(this.form.img1) || this.inNullParam(this.form.companyName)){
- uni.showToast({title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅4锛�',icon: "none",duration: 2000});
- this.loading =false
+ }
+ if (this.form.authType == 0) {
+ if (this.inNullParam(this.form.img11) || this.inNullParam(this.form.img21)) {
+ uni.showToast({
+ title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅3锛�',
+ icon: "none",
+ duration: 2000
+ });
+ this.loading = false
return
- }
- }
- if(this.form.type != 0 && this.form.authType == 1 && this.inNullParam(this.form.img2)){
- uni.showToast({title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅锛�',icon: "none",duration: 2000});
- this.loading =false
+ }
+ } else {
+ if (this.inNullParam(this.form.img1) || this.inNullParam(this.form.companyName)) {
+ uni.showToast({
+ title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅4锛�',
+ icon: "none",
+ duration: 2000
+ });
+ this.loading = false
+ return
+ }
+ }
+ if (this.form.type != 0 && this.form.authType == 1 && this.inNullParam(this.form.img2)) {
+ uni.showToast({
+ title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅锛�',
+ icon: "none",
+ duration: 2000
+ });
+ this.loading = false
return
- }
- if(this.form.type == 1 && this.form.authType == 1 && this.inNullParam(this.form.img2)){
- uni.showToast({title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅5锛�',icon: "none",duration: 2000});
- this.loading =false
+ }
+ if (this.form.type == 1 && this.form.authType == 1 && this.inNullParam(this.form.img2)) {
+ uni.showToast({
+ title: '瀵逛笉璧凤紝璇锋寜瑕佹眰濉啓鐢宠淇℃伅5锛�',
+ icon: "none",
+ duration: 2000
+ });
+ this.loading = false
return
- }
-
- var that = this
- var param =this.form;
- if(this.form.authType == 0){
- param.img1 = this.form.img11,
- param.img2 = this.form.img21
- }
- console.log('鎻愪氦鍙傛暟锛�',param)
- this.$u.api.applyForIdentity(param).then(res =>{
- if(res.code ===200){
- uni.showToast({
- title: res.message||'鐢宠鎴愬姛 ',
- icon: "none",
- duration: 2000
- });
- uni.navigateBack({ delta: 1 });
- }
- }).finally(()=>{
- that.loading =false
- })
- } ,
- chooseMPLoaction(){
- var that =this
+ }
+ var that = this
+ var param = this.form;
+ if (this.form.authType == 0) {
+ param.img1 = this.form.img11,
+ param.img2 = this.form.img21
+ }
+ uni.requestSubscribeMessage({
+ tmplIds: ['4H9ztG4E9BxJLwMuYSZ6oiM7yb4KX7u7bYhkhYJP0-Y'],
+ success(res) {
+ console.log('鎻愪氦鍙傛暟锛�', param)
+ this.$u.api.applyForIdentity(param).then(res => {
+ if (res.code === 200) {
+ uni.showToast({
+ title: res.message || '鐢宠鎴愬姛 ',
+ icon: "none",
+ duration: 2000
+ });
+ uni.navigateBack({
+ delta: 1
+ });
+ }
+ }).finally(() => {
+ that.loading = false
+ })
+ }
+ })
+ },
+ chooseMPLoaction() {
+ var that = this
uni.chooseLocation({
- success:(res)=> {
+ success: (res) => {
console.log(res);
- this.form.location=res.address
- this.form.lat=res.latitude
- this.form.lgt=res.longitude
+ this.form.location = res.address
+ this.form.lat = res.latitude
+ this.form.lgt = res.longitude
},
- fail:()=>{
+ fail: () => {
// 濡傛灉鐢╱ni.chooseLocation娌℃湁鑾峰彇鍒板湴鐞嗕綅缃紝鍒欓渶瑕佽幏鍙栧綋鍓嶇殑鎺堟潈淇℃伅锛屽垽鏂槸鍚︽湁鍦扮悊鎺堟潈淇℃伅
uni.getSetting({
success: (res) => {
console.log(res);
var status = res.authSetting;
- if(!status['scope.userLocation']){
- // 濡傛灉鎺堟潈淇℃伅涓病鏈夊湴鐞嗕綅缃殑鎺堟潈锛屽垯闇�瑕佸脊绐楁彁绀虹敤鎴烽渶瑕佹巿鏉冨湴鐞嗕俊鎭�
+ if (!status['scope.userLocation']) {
+ // 濡傛灉鎺堟潈淇℃伅涓病鏈夊湴鐞嗕綅缃殑鎺堟潈锛屽垯闇�瑕佸脊绐楁彁绀虹敤鎴烽渶瑕佹巿鏉冨湴鐞嗕俊鎭�
uni.showModal({
- title:"鏄惁鎺堟潈褰撳墠浣嶇疆",
- content:"闇�瑕佽幏鍙栨偍鐨勫湴鐞嗕綅缃紝璇风‘璁ゆ巿鏉冿紝鍚﹀垯鍦板浘鍔熻兘灏嗘棤娉曚娇鐢�",
- success:(tip)=>{
- if(tip.confirm){
- // 濡傛灉鐢ㄦ埛鍚屾剰鎺堟潈鍦扮悊淇℃伅锛屽垯鎵撳紑鎺堟潈璁剧疆椤甸潰锛屽垽鏂敤鎴风殑鎿嶄綔
+ title: "鏄惁鎺堟潈褰撳墠浣嶇疆",
+ content: "闇�瑕佽幏鍙栨偍鐨勫湴鐞嗕綅缃紝璇风‘璁ゆ巿鏉冿紝鍚﹀垯鍦板浘鍔熻兘灏嗘棤娉曚娇鐢�",
+ success: (tip) => {
+ if (tip.confirm) {
+ // 濡傛灉鐢ㄦ埛鍚屾剰鎺堟潈鍦扮悊淇℃伅锛屽垯鎵撳紑鎺堟潈璁剧疆椤甸潰锛屽垽鏂敤鎴风殑鎿嶄綔
uni.openSetting({
- success:(data)=>{
- // 濡傛灉鐢ㄦ埛鎺堟潈浜嗗湴鐞嗕俊鎭湪锛屽垯鎻愮ず鎺堟潈鎴愬姛
- if(data.authSetting['scope.userLocation']===true){
+ success: (data) => {
+ // 濡傛灉鐢ㄦ埛鎺堟潈浜嗗湴鐞嗕俊鎭湪锛屽垯鎻愮ず鎺堟潈鎴愬姛
+ if (data
+ .authSetting[
+ 'scope.userLocation'
+ ] === true
+ ) {
uni.showToast({
- title:"鎺堟潈鎴愬姛",
- icon:"success",
- duration:1000
+ title: "鎺堟潈鎴愬姛",
+ icon: "success",
+ duration: 1000
})
// 鎺堟潈鎴愬姛鍚庯紝鐒跺悗鍐嶆chooseLocation鑾峰彇淇℃伅
uni.chooseLocation({
- success: (res) => {
- console.log("璇︾粏鍦板潃",res);
+ success: (
+ res
+ ) => {
+ console
+ .log(
+ "璇︾粏鍦板潃",
+ res
+ );
// this.getRegionFn(res);
}
})
- }else{
+ } else {
uni.showToast({
- title:"鎺堟潈澶辫触",
- icon:"none",
- duration:1000
+ title: "鎺堟潈澶辫触",
+ icon: "none",
+ duration: 1000
})
}
}
@@ -375,15 +433,19 @@
},
fail: (res) => {
uni.showToast({
- title:"璋冪敤鎺堟潈绐楀彛澶辫触",
- icon:"none",
- duration:1000
+ title: "璋冪敤鎺堟潈绐楀彛澶辫触",
+ icon: "none",
+ duration: 1000
})
}
})
}
})
},
+<<<<<<< HEAD
+ uploadImg(index) {
+ var that = this
+=======
getApplyData(){
var that = this
var param ={ type:that.flag}
@@ -416,79 +478,80 @@
},
uploadImg(index){
var that =this
+>>>>>>> 66fcf61061d6d275c1848df5d3f8e0082f6b02ba
uni.chooseImage({
count: 1, // 榛樿9
sizeType: ['original', 'compressed'],
- sourceType: ['album','camera'],//['album','camera'],
- mediaType: ['image'],//['image', 'video'],
- success: function (res1) {
- const tempFiles = res1.tempFiles //鍖呭惈鍥剧墖澶у皬鐨勬暟缁�
- if (tempFiles[0].size > 20*1024*1024) {
- uni.showToast({
- title: '涓婁紶鍥剧墖涓嶈兘澶т簬20M!',
- duration: 2000,
- icon: "none"
- });
- return
- }
-
- uni.uploadFile({
- url: that.$baseUrl + 'web/public/upload',
- filePath: res1.tempFilePaths[0],
- name: 'file',
- formData: {
- 'folder': 'identity',
- 'flag':index
- },
- success:(data)=>{
+ sourceType: ['album', 'camera'], //['album','camera'],
+ mediaType: ['image'], //['image', 'video'],
+ success: function(res1) {
+ const tempFiles = res1.tempFiles //鍖呭惈鍥剧墖澶у皬鐨勬暟缁�
+ if (tempFiles[0].size > 20 * 1024 * 1024) {
uni.showToast({
- title: '涓婁紶鎴愬姛',
+ title: '涓婁紶鍥剧墖涓嶈兘澶т簬20M!',
duration: 2000,
icon: "none"
});
- const res = JSON.parse(data.data)
-
- console.log(res)
- if(res.data.flag == '11'){
- that.form.img11=res.data.imgaddr
- that.form.img11Full=res.data.url
- }else if(res.data.flag == '21'){
- that.form.img21=res.data.imgaddr
- that.form.img21Full=res.data.url
- console.log(21,that.form.img21Full)
- }else if(res.data.flag == '1'){
- that.form.img1=res.data.imgaddr
- that.form.img1Full=res.data.url
- }else if(res.data.flag == '2'){
- that.form.img2=res.data.imgaddr
- that.form.img2Full=res.data.url
- }else if(res.data.flag == '3'){
- that.form.img3=res.data.imgaddr
- that.form.img3Full=res.data.url
- }else if(res.data.flag == '4'){
- that.form.img4=res.data.imgaddr
- that.form.img4Full=res.data.url
- }
- },
- fail:(e)=>{
- uni.showToast({
- title: '涓婁紶澶辫触',
- duration: 2000,
- icon: "none"
- });
+ return
}
- })
+
+ uni.uploadFile({
+ url: that.$baseUrl + 'web/public/upload',
+ filePath: res1.tempFilePaths[0],
+ name: 'file',
+ formData: {
+ 'folder': 'identity',
+ 'flag': index
+ },
+ success: (data) => {
+ uni.showToast({
+ title: '涓婁紶鎴愬姛',
+ duration: 2000,
+ icon: "none"
+ });
+ const res = JSON.parse(data.data)
+
+ console.log(res)
+ if (res.data.flag == '11') {
+ that.form.img11 = res.data.imgaddr
+ that.form.img11Full = res.data.url
+ } else if (res.data.flag == '21') {
+ that.form.img21 = res.data.imgaddr
+ that.form.img21Full = res.data.url
+ console.log(21, that.form.img21Full)
+ } else if (res.data.flag == '1') {
+ that.form.img1 = res.data.imgaddr
+ that.form.img1Full = res.data.url
+ } else if (res.data.flag == '2') {
+ that.form.img2 = res.data.imgaddr
+ that.form.img2Full = res.data.url
+ } else if (res.data.flag == '3') {
+ that.form.img3 = res.data.imgaddr
+ that.form.img3Full = res.data.url
+ } else if (res.data.flag == '4') {
+ that.form.img4 = res.data.imgaddr
+ that.form.img4Full = res.data.url
+ }
+ },
+ fail: (e) => {
+ uni.showToast({
+ title: '涓婁紶澶辫触',
+ duration: 2000,
+ icon: "none"
+ });
+ }
+ })
},
- fail:function(err){
- hideLoading()
- reject("閫夋嫨鏂囦欢澶辫触",err)
+ fail: function(err) {
+ hideLoading()
+ reject("閫夋嫨鏂囦欢澶辫触", err)
}
})
},
- initFormData(){
+ initFormData() {
this.form = {
"companyName": "",
- authType:0,
+ authType: 0,
"img1": "",
"img2": "",
"img11": "",
@@ -505,8 +568,8 @@
"lat": null,
"lgt": null,
"linkName": this.userInfo.name,
- "location": "",
- "telephone": this.userInfo.telephone,
+ "location": "",
+ "telephone": this.userInfo.telephone,
"type": this.flag
}
}
@@ -523,6 +586,7 @@
<style lang="scss" scoped>
.box {
width: 100%;
+
.box-head {
width: 100%;
height: 300rpx;
@@ -530,6 +594,7 @@
box-sizing: border-box;
background-repeat: no-repeat;
background-size: 100% 100%;
+
.box-head-botton {
width: 100%;
height: 88rpx;
@@ -542,24 +607,28 @@
border-radius: 44rpx;
margin-top: 30rpx;
}
+
.box-head-info {
width: 100%;
display: flex;
flex-direction: column;
+
text {
&:nth-child(1) {
font-weight: bold;
font-size: 48rpx;
color: #FFFFFF;
}
+
&:nth-child(2) {
font-weight: 400;
font-size: 26rpx;
- color: rgba(255,255,255,0.8);
+ color: rgba(255, 255, 255, 0.8);
margin-top: 14rpx;
}
}
}
+
.box-head-content {
width: 100%;
padding: 40rpx 30rpx;
@@ -567,14 +636,17 @@
background-color: #FFFFFF;
border-radius: 20rpx;
margin-top: 30rpx;
+
.item {
width: 100%;
display: flex;
flex-direction: column;
margin-bottom: 30rpx;
+
&:last-child {
margin: 0 !important;
}
+
.item-cate {
width: 100%;
display: flex;
@@ -582,10 +654,12 @@
padding: 30rpx 0;
box-sizing: border-box;
border-bottom: 1rpx solid #E5E5E5;
+
.active {
background: #00BC12 !important;
color: #FFFFFF !important;
}
+
.item-cate-row {
width: 208rpx;
height: 72rpx;
@@ -594,20 +668,24 @@
background: #EEEEEE;
border-radius: 36rpx;
margin-right: 20rpx;
+
&:last-child {
margin: 0 !important;
}
}
}
+
.item-label {
display: flex;
align-items: center;
+
text {
&:nth-child(1) {
font-weight: 500;
font-size: 32rpx;
color: #222222;
}
+
&:nth-child(2) {
font-weight: 500;
font-size: 32rpx;
@@ -615,6 +693,7 @@
}
}
}
+
.item-upload {
width: 100%;
padding: 30rpx 0;
@@ -623,6 +702,7 @@
align-items: center;
justify-content: space-between;
flex-wrap: wrap;
+
.item-upload-item {
width: 300rpx;
border-radius: 10px;
@@ -631,30 +711,35 @@
align-items: center;
justify-content: content;
overflow: hidden;
- border:1px solid #c2c2c2;
+ border: 1px solid #c2c2c2;
+
image {
width: 100%;
height: 100%;
}
}
+
.item-upload-item1 {
width: 45%;
padding-bottom: 40px;
border-radius: 10px;
+
.image {
width: 100%;
height: 196rpx;
background: #F7F7F7;
- border:1px solid #c2c2c2;
+ border: 1px solid #c2c2c2;
border-radius: 16rpx;
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
+
image {
width: 48rpx;
height: 48rpx;
}
+
text {
font-weight: 400;
font-size: 28rpx;
@@ -662,18 +747,21 @@
margin-top: 12rpx;
}
}
+
.info {
width: 100%;
display: flex;
align-items: center;
justify-content: center;
margin-top: 16rpx;
+
text {
&:nth-child(1) {
font-weight: 400;
font-size: 26rpx;
color: #333333;
}
+
&:nth-child(2) {
font-weight: 400;
font-size: 26rpx;
@@ -683,6 +771,7 @@
}
}
}
+
.item-val {
width: 100%;
padding: 30rpx 0;
@@ -692,17 +781,20 @@
align-items: center;
justify-content: space-between;
border-bottom: 1rpx solid #E5E5E5;
+
input {
width: 100%;
font-weight: 400;
font-size: 30rpx;
color: #222222;
}
+
text {
font-weight: 400;
font-size: 30rpx;
color: #666666;
}
+
button {
width: 100%;
height: 100%;
@@ -716,4 +808,4 @@
}
}
}
-</style>
+</style>
\ No newline at end of file
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index fec1ae9..880b9c9 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -11,14 +11,12 @@
<view class="search" :style="{ top: statusbarHeight + navHeight + 'px' }">
<view class="index-j-cate">
<view class="index-j-cate-item" v-for="(item, index) in searchType" :key="index" @click="clickCate(item.id)">
- <text :style="{ color: typeVal === item.id ? '##222222' : '' }">{{item.name}}</text>
+ <text :style="{ color: typeVal === item.id ? '#222222' : '', fontSize: typeVal === item.id ? '36rpx' : '', fontWeight: typeVal === item.id ? '600' : '' }">{{item.name}}</text>
<view class="index-j-cate-item-x" v-if="typeVal === item.id"></view>
</view>
</view>
<view class="index-j-search">
- <view class="index-j-search-item active">鏈�鏂板彂甯�</view>
- <view class="index-j-search-item">璺濈浼樺厛</view>
- <view class="index-j-search-item">浠锋牸浠庨珮鍒颁綆</view>
+ <view :class="sortType === item.id ? 'index-j-search-item active' : 'index-j-search-item'" v-for="(item, index) in sortList" :key="index" @click="clickSort(item.id)">{{item.name}}</view>
</view>
</view>
<view class="index-j-list">
@@ -40,31 +38,43 @@
{{item.categoryName}}锝渰{item.priceNum1}}鏂�
</view>
<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 1">
- {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ {{item.categoryName}}锝渰{item.priceNum1}}浜�
</view>
<view class="index-list-item-info" v-if="item.type === 0 && item.workType === 2">
- {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ {{item.categoryName}}锝渰{item.priceNum1}}浜�
</view>
<view class="index-list-item-info" v-if="item.type === 1">
- {{item.categoryName}}锝渰{item.priceNum1}}鏂�
+ {{item.transportTypeName}} | {{item.transportNum}}{{item.transportUnit}}锝滅敤杞{item.priceNum1}}澶�
</view>
<view class="index-list-item-info" v-if="item.type === 2">
{{item.wayInfoCopy}}
</view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
- <text>{{item.location}}</text>
+
+ <view class="address" v-if="item.type === 1">
+ <view class="address-xian"></view>
+ <view class="address-row" v-for="(address, i) in item.wayInfo" :key="i">
+ <image src="/static/icon/ic_qidian@2x.png" mode="widthFix" v-if="i === 0"></image>
+ <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix" v-else-if="i !== 0 && i !== item.wayInfo.length - 1"></image>
+ <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix" v-else-if="i === item.wayInfo.length - 1"></image>
+ <text>{{item.location}}</text>
+ </view>
</view>
- <view class="index-list-item-dz">
- <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
- <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.priceNum1}}澶╋級</text>
- </view>
+ <template v-if="[0, 2].includes(item.type)">
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
+ <text>{{item.location}}</text>
+ </view>
+ <view class="index-list-item-dz">
+ <image src="/static/icon/order_ic_time@2x.png" mode="widthFix"></image>
+ <text>{{item.startDate}} 鑷� {{item.endDate}}锛坽{item.priceNum1}}澶╋級</text>
+ </view>
+ </template>
<view class="index-list-item-price">
<text>棰勪及锛�</text>
<text>楼{{item.estimatedAccount / 100}}</text>
</view>
<view class="eidt">
- <sunui-mverify @change="mverify($event, item.id)"></sunui-mverify>
+ <sunui-mverify @change="getaccept($event, item.id, index)"></sunui-mverify>
</view>
</view>
</view>
@@ -311,7 +321,7 @@
export default {
components: { sunuiMverify },
computed: {
- ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid']),
+ ...mapState(['navHeight', 'statusbarHeight','userInfo','token','openid', 'latitude', 'longitude']),
totalPrice() {
return this.form.estimatedAccount / 100
}
@@ -346,6 +356,11 @@
{ name: '鍒嗘嫞宸�', id: 1 },
{ name: '鍖呰宸�', id: 2 }
],
+ sortList: [
+ { name: '鏈�鏂板彂甯�', id: 0 },
+ { name: '璺濈浼樺厛', id: 1 },
+ { name: '浠锋牸浠庨珮鍒颁綆', id: 2 }
+ ],
car: [],
btn: require('@/static/image/btn.png'),
typeViewId: 0,
@@ -375,13 +390,15 @@
estimatedAccount: '',
price: ''
},
-
+ sortType: 0,
orderList: [],
typeVal: '',
- page: 1
+ page: 1,
+ next: true
}
},
- onLoad() {
+ async onLoad() {
+ await this.$onLaunched;
this.getCategoryLists()
this.getOrderList()
this.form.linkPhone = this.userInfo.telephone
@@ -389,29 +406,23 @@
watch: {
typeId: {
handler(news, old) {
- this.form = {
- startDate: '',
- endDate: '',
- latitude: '',
- longitude: '',
- location: '',
- locationEnd: '',
- wayInfoDTOList: [],
- workType: 0,
- categoryId: '',
- categoryName: '',
- days: '',
- locationRemark: '',
- supplement: '',
- multifileList: [],
- linkName: '',
- linkPhone: '',
- estimatedAccount: '',
- price: ''
- }
+ this.form.startDate = ''
+
+ this.form.endDate = ''
+ this.form.latitude = ''
+ this.form.longitude = ''
+ this.form.location = ''
+ this.form.locationEnd = ''
+ this.form.wayInfoDTOList = ''
+ this.form.workType = ''
+ this.form.days = ''
+ this.form.locationRemark = ''
+ this.form.supplement = ''
+ this.form.multifileList = []
+ this.form.linkName = ''
+ this.form.estimatedAccount = ''
+ this.form.price = ''
this.viewStatus = false
- this.carImage = ''
- this.carRemark = ''
}
},
orderFood: {
@@ -440,21 +451,49 @@
}
}
},
+ onReachBottom() {
+ this.getOrderList()
+ },
methods: {
+ // 鎵嬪姩鎺ュ崟
+ getaccept(e, orderId, index) {
+ this.$u.api.accept({ orderId })
+ .then(res => {
+ uni.showToast({ title: '鎶㈠崟鎴愬姛锛�', icon: 'success', duration: 2000 })
+ setTimeout(() => {
+ this.page = 1
+ this.next = true
+ this.orderList = []
+ this.getOrderList()
+ }, 2000)
+ })
+ },
+ clickSort(id) {
+ this.sortType = id
+ this.page = 1
+ this.next = true
+ this.orderList = []
+ this.getOrderList()
+ },
clickCate(id) {
this.typeVal = id
this.page = 1
- this.list = []
+ this.next = true
+ this.orderList = []
this.getOrderList()
},
// 璁㈠崟鍒嗛〉
getOrderList() {
+ if (!this.next) return;
this.$u.api.orderPage({
capacity: 10,
page: this.page,
model: {
queryMyOrderType: 2,
- type: this.typeVal
+ type: this.typeVal,
+ sortType: this.sortType,
+ queryLat: this.latitude,
+ queryLgt: this.longitude
}
}).then(res => {
res.data.records.forEach(item => {
@@ -463,10 +502,16 @@
item.wayInfoCopy = JSON.parse(item.wayInfo).map(item => {
return `${item.name}${item.price / 100}鍏�(${item.num}浠�)`
}).join(' | ')
+ // 杩愯揣
+ } else if (item.type === 1) {
+ item.wayInfo = JSON.parse(item.wayInfo)
}
})
- console.log(res.data.records)
this.orderList = [...this.orderList, ...res.data.records]
+
+ if (this.orderList.length === res.data.total) {
+ this.next = false
+ }
})
},
// 鎻愪氦璁㈠崟
@@ -604,6 +649,12 @@
},
clickType(e) {
this.typeId = e
+ if (e === 2) {
+ this.form.categoryId = this.car[0].id
+ this.form.categoryName = this.car[0].name
+ this.carRemark = this.car[0].remark
+ this.carImage = this.car[0].iconFull
+ }
},
clickTypeWork(e) {
this.form.workType = e
@@ -681,9 +732,6 @@
url: `/pages/freight/freight`
})
}
- },
- mverify(e, id){
- console.log('楠岃瘉缁撴灉:', e, id);
},
// 閫夋嫨濂楅
selectMenu(a, b) {
diff --git a/small-program/pages/mine/mine.vue b/small-program/pages/mine/mine.vue
index d6e5091..a6fe7a9 100644
--- a/small-program/pages/mine/mine.vue
+++ b/small-program/pages/mine/mine.vue
@@ -260,6 +260,7 @@
console.log(222,res)
if(res.code ===200){
that.userInfo.useIdentity = param.useIdentity
+ uni.$emit('refresh')
}
}).finally(() => {
that.changing1 = false
diff --git a/small-program/store/index.js b/small-program/store/index.js
index 6db6273..e783ab2 100644
--- a/small-program/store/index.js
+++ b/small-program/store/index.js
@@ -16,7 +16,10 @@
statusbarHeight: statusbarHeight || '',
userInfo: userInfo || {},
token: token || '',
- openid:token || ''
+ openid: token || '',
+
+ latitude: '',
+ longitude: ''
},
mutations: {
// 璁剧疆瀵艰埅鏍忛珮搴�
@@ -41,6 +44,12 @@
state.userInfo = val
uni.setStorageSync('userInfo', val);
},
+ // 璁剧疆缁忕含搴�
+ setPosition(state, obj) {
+ console.log(obj)
+ state.latitude = obj.latitude
+ state.longitude = obj.longitude
+ },
// 娓呴櫎缂撳瓨鏁版嵁
empty(state) {
state.userInfo = ''
diff --git a/small-program/utils/http.interceptor.js b/small-program/utils/http.interceptor.js
index dc1d37e..1b6a96c 100644
--- a/small-program/utils/http.interceptor.js
+++ b/small-program/utils/http.interceptor.js
@@ -13,7 +13,7 @@
// 鍝嶅簲鎷︽埅鍣�
uni.$u.http.interceptors.response.use((response) => {
- console.log(response.data)
+ // console.log(response.data)
if (response.data.code === 5113) {
uni.switchTab({
url: '/pages/index/index'
--
Gitblit v1.9.3