From 85ab4a970ed3a6bb793e1b70f0af72b061d8c020 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 28 八月 2025 17:18:35 +0800
Subject: [PATCH] 修BUG
---
admin/src/views/business/member.vue | 21 +++
small-program/pages/employment-certification/employment-certification.vue | 38 +++---
admin/src/views/business/identityInfo.vue | 20 +-
small-program/pages/packaging-worker/packaging-worker.vue | 2
admin/src/components/system/dict/DictDataManagerWindow.vue | 1
small-program/pages/sorting/sorting.vue | 2
small-program/pages/using-workers/using-workers.vue | 18 +-
small-program/pages/index/index.vue | 135 +++++++++++++--------
small-program/pages/order-details/order-details.vue | 60 +++++++--
small-program/pages/freight/freight.vue | 26 ++-
10 files changed, 206 insertions(+), 117 deletions(-)
diff --git a/admin/src/components/system/dict/DictDataManagerWindow.vue b/admin/src/components/system/dict/DictDataManagerWindow.vue
index 5fb62d7..b2a07c1 100644
--- a/admin/src/components/system/dict/DictDataManagerWindow.vue
+++ b/admin/src/components/system/dict/DictDataManagerWindow.vue
@@ -15,6 +15,7 @@
<li><el-button @click="sort('bottom')" :loading="isWorking.sort" icon="el-icon-sort-down" v-permissions="['system:menu:sort']">涓嬬Щ</el-button></li>
</ul>
<el-table
+ :height="tableHeightNew"
v-loading="isWorking.search"
:data="tableData.list"
stripe
diff --git a/admin/src/views/business/identityInfo.vue b/admin/src/views/business/identityInfo.vue
index ff07962..077f9aa 100644
--- a/admin/src/views/business/identityInfo.vue
+++ b/admin/src/views/business/identityInfo.vue
@@ -53,8 +53,8 @@
<span class="redstate" v-if="row.auditStatus ==3">鏈�氳繃</span>
</template>
</el-table-column>
- <el-table-column prop="openid" label="openid" min-width="100px"></el-table-column>
- <el-table-column prop="memberName" label="浼氬憳鏄电О" min-width="100px"></el-table-column>
+ <el-table-column prop="openid" label="openid" min-width="180px" :show-overflow-tooltip='true'></el-table-column>
+ <el-table-column prop="memberName" label="浼氬憳鏄电О" min-width="100px" :show-overflow-tooltip='true'></el-table-column>
<el-table-column prop="type" label="绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.type ==0">鐢ㄥ伐韬唤</span>
@@ -68,14 +68,14 @@
<span v-if="row.authType ==1">浼佷笟</span>
</template>
</el-table-column>
- <el-table-column prop="linkName" label="鑱旂郴浜�" min-width="100px"></el-table-column>
- <el-table-column prop="telephone" label="鑱旂郴鏂瑰紡" min-width="100px"></el-table-column>
- <el-table-column prop="location" label="鎺ュ崟浣嶇疆" min-width="100px"></el-table-column>
- <el-table-column prop="companyName" label="鍗曚綅鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="createTime" label="鐢宠鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="updateUser" label="瀹℃牳浜�" min-width="100px"></el-table-column>
- <el-table-column prop="auditTime" label="璁よ瘉瀹℃壒鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="auditRemark" label="璁よ瘉瀹℃壒澶囨敞" min-width="100px"></el-table-column>
+ <el-table-column prop="linkName" label="鑱旂郴浜�" min-width="100px" :show-overflow-tooltip='true'></el-table-column>
+ <el-table-column prop="telephone" label="鑱旂郴鏂瑰紡" min-width="100px" :show-overflow-tooltip='true'></el-table-column>
+ <el-table-column prop="location" label="鎺ュ崟浣嶇疆" min-width="180px" :show-overflow-tooltip='true'></el-table-column>
+ <el-table-column prop="companyName" label="鍗曚綅鍚嶇О" min-width="150px" :show-overflow-tooltip='true'></el-table-column>
+ <el-table-column prop="createTime" label="鐢宠鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="editorName" label="瀹℃牳浜�" min-width="100px" :show-overflow-tooltip='true'></el-table-column>
+ <el-table-column prop="auditTime" label="璁よ瘉瀹℃壒鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="auditRemark" label="璁よ瘉瀹℃壒澶囨敞" min-width="120px" :show-overflow-tooltip='true'></el-table-column>
<el-table-column
v-if="containPermissions(['business:identityinfo:update','business:identityinfo:query'])"
label="鎿嶄綔"
diff --git a/admin/src/views/business/member.vue b/admin/src/views/business/member.vue
index 1caeacf..6e99eef 100644
--- a/admin/src/views/business/member.vue
+++ b/admin/src/views/business/member.vue
@@ -29,6 +29,7 @@
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
+ <el-button type="primary" :loading="isWorking.export" @click="exportExcel">瀵煎嚭</el-button>
</section>
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
@@ -50,12 +51,19 @@
<span style="cursor: pointer;color: #2E68EC" @click="openDetail(row)">{{row.openid}}</span>
</template>
</el-table-column>
- <el-table-column prop="telephone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="nickName" label="鏄电О" min-width="100px"></el-table-column>
<el-table-column prop="name" label="鐪熷疄濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="telephone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="workerIdentity" label="韬唤" min-width="100px">
<template slot-scope="{row}">
鍙戝崟鏂�<span v-if="row.workerIdentity == 2 || row.driverIdentity == 2 || row.chefIdentity == 2">{{' | 鎺ュ崟鏂�'}}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="workerIdentity" label="鎺ュ崟璁よ瘉韬唤" width="120px">
+ <template slot-scope="{row}">
+ <div v-if="row.workerIdentity == 2" class="renzhen">宸ヤ汉</div>
+ <div v-if=" row.driverIdentity == 2" class="renzhen">鍙告満</div>
+ <div v-if="row.chefIdentity == 2" class="renzhen">渚涢</div>
</template>
</el-table-column>
<el-table-column prop="amount" label="褰撳墠浣欓(鍏�)" min-width="100px">
@@ -166,3 +174,14 @@
}
}
</script>
+<style scoped lang="scss">
+.renzhen{
+ margin: 5px;
+ line-height: 30px;
+ color:#67c23a;
+ height: 30px;
+ text-align:center;
+ border-color: #e1f3d8;
+ background-color: #f0f9eb;
+}
+</style>
diff --git a/small-program/pages/employment-certification/employment-certification.vue b/small-program/pages/employment-certification/employment-certification.vue
index 0f3d126..b0b3a56 100644
--- a/small-program/pages/employment-certification/employment-certification.vue
+++ b/small-program/pages/employment-certification/employment-certification.vue
@@ -84,8 +84,8 @@
</view>
<view class="item-upload" v-if="flag==0">
<view class="item-upload-item1" @click="uploadImg(1)">
- <view class="image">
- <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
+ <view class="image":style="form.img1Full?'background-image:url('+form.img1Full+') ;background-size: 100% 100%;':''">
+ <image v-if="1==2&&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>
@@ -96,8 +96,8 @@
</view>
</view>
<view class="item-upload-item1" @click="uploadImg(2)">
- <view class="image">
- <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
+ <view class="image":style="form.img2Full?'background-image:url('+form.img2Full+') ;background-size: 100% 100%;':''">
+ <image v-if="1==2&&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>
@@ -109,10 +109,10 @@
</view>
<view class="item-upload" v-if="flag==1">
<view class="item-upload-item1" @click="uploadImg(1)">
- <view class="image">
- <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
+ <view class="image" :style="form.img1Full?'background-image:url('+form.img1Full+') ;background-size: 100% 100%;':''">
+ <image v-if="1==2&&form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
</image>
- <image v-else src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
+ <image src="/static/icon/ic_camera@2x.png" mode="widthFix"></image>
<text>鐐瑰嚮涓婁紶</text>
</view>
<view class="info">
@@ -121,8 +121,8 @@
</view>
</view>
<view class="item-upload-item1" @click="uploadImg(2)">
- <view class="image">
- <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
+ <view class="image" :style="form.img2Full?'background-image:url('+form.img2Full+') ;background-size: 100% 100%;':''">
+ <image v-if="1==2&&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>
@@ -133,8 +133,8 @@
</view>
</view>
<view class="item-upload-item1" @click="uploadImg(3)">
- <view class="image">
- <image v-if="form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix">
+ <view class="image":style="form.img3Full?'background-image:url('+form.img3Full+') ;background-size: 100% 100%;':''">
+ <image v-if="1==2&&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>
@@ -146,8 +146,8 @@
</view>
<view class="item-upload" v-if="flag==2">
<view class="item-upload-item1" @click="uploadImg(1)">
- <view class="image">
- <image v-if="form.img1Full && form.img1Full !=''" :src=" form.img1Full" mode="widthFix">
+ <view class="image":style="form.img1Full?'background-image:url('+form.img1Full+') ;background-size: 100% 100%;':''">
+ <image v-if="1==2&&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>
@@ -158,8 +158,8 @@
</view>
</view>
<view class="item-upload-item1" @click="uploadImg(2)">
- <view class="image">
- <image v-if="form.img2Full && form.img2Full !=''" :src=" form.img2Full" mode="widthFix">
+ <view class="image":style="form.img2Full?'background-image:url('+form.img2Full+') ;background-size: 100% 100%;':''">
+ <image v-if="1==2&&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>
@@ -170,8 +170,8 @@
</view>
</view>
<view class="item-upload-item1" @click="uploadImg(3)">
- <view class="image">
- <image v-if="form.img3Full && form.img3Full !=''" :src=" form.img3Full" mode="widthFix">
+ <view class="image":style="form.img3Full?'background-image:url('+form.img3Full+') ;background-size: 100% 100%;':''">
+ <image v-if="1==2&&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>
@@ -182,8 +182,8 @@
</view>
</view>
<view class="item-upload-item1" @click="uploadImg(4)">
- <view class="image">
- <image v-if="form.img4Full && form.img4Full !=''" :src=" form.img4Full" mode="widthFix">
+ <view class="image":style="form.img4Full?'background-image:url('+form.img4Full+') ;background-size: 100% 100%;':''">
+ <image v-if="1==2&&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>
diff --git a/small-program/pages/freight/freight.vue b/small-program/pages/freight/freight.vue
index 93c0835..750f55f 100644
--- a/small-program/pages/freight/freight.vue
+++ b/small-program/pages/freight/freight.vue
@@ -140,7 +140,7 @@
<view class="list-item-row">
<view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
<view class="list-item-row-val">
- <input type="number" @blur="getPrice" v-model="form.price" placeholder="璇疯緭鍏�" />
+ <input type="digit" @blur="getPrice" v-model="form.price" placeholder="璇疯緭鍏�" />
<text>{{form.priceUnit}}</text>
</view>
</view>
@@ -285,7 +285,7 @@
],
dw: [['涓�', '鏂�']],
carArr: [],
- viewStatus: false
+ viewStatus: true
};
},
watch: {
@@ -341,6 +341,13 @@
this.getCategoryLists()
},
methods: {
+ handleInputPrice(e) {
+ try{
+ this.form.price = Number(this.form.price).toFixed(3)
+ }catch(e){
+ this.form.price =null
+ }
+ },
confirmDw(e) {
this.form.transportUnit = e.value[0]
this.show4 = false
@@ -368,7 +375,7 @@
}
if (!that.form.id) {
uni.requestSubscribeMessage({
- tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg'],
+ tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg','AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8'],
success(res) {
that.$u.api.release({
...that.form,
@@ -396,9 +403,9 @@
}
})
} else {
- uni.requestSubscribeMessage({
- tmplIds: ['3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk'],
- success(res) {
+ // uni.requestSubscribeMessage({
+ // tmplIds: ['3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk','AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8'],
+ // success(res) {
that.$u.api.updateOrder({
...that.form,
price: Number(that.form.price) * 100,
@@ -429,8 +436,8 @@
}, 1500)
}
})
- }
- })
+ // }
+ // })
}
},
uploadImg() {
@@ -463,7 +470,7 @@
getPrice() {
if (this.form.price && this.form.priceNum1 && this.form.priceNum2) {
this.$u.api.getTotal({
- price: Number(this.form.price) * 100,
+ price: Number(this.form.price).toFixed(2) * 100,
priceUnit: this.form.priceUnit,
priceNum1: this.form.priceNum1,
priceNum2: this.form.priceNum2,
@@ -950,6 +957,7 @@
align-items: center;
justify-content: space-between;
text {
+ width: 80%;
flex-shrink: 0;
font-weight: 400;
font-size: 30rpx;
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 1299158..8d5d6c7 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -20,7 +20,7 @@
</view>
</view>
<view class="index-j-list">
- <view class="index-list-item" v-for="(item, index) in orderList" :key="index">
+ <view class="index-list-item" v-if="orderList" 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>
@@ -52,7 +52,7 @@
<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">
+ <view class="address-row" v-if="item.wayInfo" 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>
@@ -93,6 +93,7 @@
<view class="index-c-cate">
<view
+ v-if="type"
:class="typeId === item.id ? 'index-c-cate-item active' : 'index-c-cate-item'"
v-for="(item, index) in type"
:key="index"
@@ -116,11 +117,11 @@
<view class="list-item-row">
<view class="list-item-row-label">鐢ㄩ鏃堕棿<b>*</b></view>
<view class="list-item-row-radio">
- <view class="radio-item" v-for="(item, index) in orderFood" :key="index">
+ <view class="radio-item" v-if="orderFood" v-for="(item, index) in orderFood" :key="index">
<view class="radio-item-label">{{item.name}}</view>
<view class="radio-item-list">
<view class="radio-item-list-l">
- <view v-if="child.price" :class="child.active ? 'radio-item-list-item active' : 'radio-item-list-item'" v-for="(child, childIndex) in item.list" :key="childIndex" @click="selectMenu(index, childIndex)">{{child.price||0}}鍏�</view>
+ <view v-if="item.list" :class="child.active ? 'radio-item-list-item active' : 'radio-item-list-item'" v-for="(child, childIndex) in item.list" :key="childIndex" @click="selectMenu(index, childIndex)">{{child.price||0}}鍏�</view>
</view>
<view class="radio-item-list-data">
<text style="flex-shrink: 0;">浠芥暟锛�</text>
@@ -154,7 +155,7 @@
<view class="list-item-row" v-if="viewStatus">
<view class="list-item-row-label">鍥剧墖</view>
<view class="list-item-row-upload">
- <view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
+ <view class="upload-item" v-if=" form.multifileList" v-for="(item, index) in form.multifileList" :key="index">
<image :src="item.url" mode="widthFix"></image>
<image class="upload-item-dele" @click="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
</view>
@@ -207,7 +208,7 @@
<!-- 鐢ㄥ伐 -->
<template v-if="typeId === 0">
<view class="box-hz-cate">
- <view :class="form.workType === item.id ? 'box-hz-cate-item active' : 'box-hz-cate-item'" v-for="(item, index) in typeWork" :key="index" @click="clickTypeWork(item.id)">
+ <view v-if="typeWork" :class="form.workType === item.id ? 'box-hz-cate-item active' : 'box-hz-cate-item'" v-for="(item, index) in typeWork" :key="index" @click="clickTypeWork(item.id)">
<text>{{item.name}}</text>
<view class="box-hz-cate-item-x" v-if="form.workType === item.id"></view>
</view>
@@ -238,12 +239,13 @@
<!-- 杩愯揣 -->
<template v-if="typeId === 1">
- <view class="box-hz-cate">
- <view :class="form.categoryId === item.id ? 'box-hz-cate-item active' : 'box-hz-cate-item'" v-for="(item, index) in car" :key="index" @click="clickCar(item)">
+ <scroll-view class="nav-scroll" scroll-x="true">
+ <view v-if="car" :class="form.categoryId === item.id ? 'nav-item active' : 'nav-item'" v-for="(item, index) in car" :key="index" @click="clickCar(item)">
<text>{{item.name}}</text>
- <view class="box-hz-cate-item-x" v-if="form.categoryId === item.id"></view>
+ <view class="nav-item-x" v-if="form.categoryId === item.id"></view>
</view>
- </view>
+ </scroll-view>
+
<view class="box-hz-car">
<view class="box-hz-car-image">
<image :src="carImage" mode="widthFix"></image>
@@ -278,7 +280,7 @@
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
- <view class="item-d-row" v-for="(item, index) in form.wayInfoDTOList" :key="index" @click="selectAddress(4, index)">
+ <view class="item-d-row" v-if="form.wayInfoDTOList" v-for="(item, index) in form.wayInfoDTOList" :key="index" @click="selectAddress(4, index)">
<view class="item-d-row-icon">
<image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
</view>
@@ -321,7 +323,7 @@
<view></view>
<text>瀹㈡湇鐢佃瘽</text>
</view>
- <view class="phone-item" v-for="(item,index) in serverPhone" :key="item" @click="contactPhoneDo(item)">
+ <view class="phone-item" v-if="serverPhone" v-for="(item,index) in serverPhone" :key="item" @click="contactPhoneDo(item)">
<view></view>
<text>{{item}}</text>
</view>
@@ -483,25 +485,6 @@
},
async onShow(options) {
await this.$onLaunched;
- console.log('2')
- this.form.startDate = ''
- this.form.address = ''
- this.form.endDate = ''
- this.form.latitude = ''
- this.form.longitude = ''
- this.form.location = ''
- this.form.locationEnd = ''
- this.form.wayInfoDTOList = []
- this.form.workType = 0
- this.form.days = ''
- this.form.locationRemark = ''
- this.form.supplement = ''
- this.form.multifileList = []
- this.form.estimatedAccount = ''
- this.form.price = ''
- this.viewStatus = false
- this.clearAll()
-
if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}') {
console.log('宸茬櫥闄�')
this.isLogin = true
@@ -524,24 +507,7 @@
watch: {
typeId: {
handler(news, old) {
- console.log('typeId')
- this.form.startDate = ''
- this.form.address = ''
- this.form.endDate = ''
- this.form.latitude = ''
- this.form.longitude = ''
- this.form.location = ''
- this.form.locationEnd = ''
- this.form.wayInfoDTOList = []
- this.form.workType = 0
- this.form.days = ''
- this.form.locationRemark = ''
- this.form.supplement = ''
- this.form.multifileList = []
- this.form.estimatedAccount = ''
- this.form.price = ''
- this.viewStatus = false
- this.clearAll()
+ this.clearFormParam()
}
},
orderFood: {
@@ -559,12 +525,14 @@
price += num * item.num
}
})
+ console.log("========================",price)
this.form.price = price
}
},
'form.price': {
handler(news, old) {
- if (news > 0) {
+ console.log(news,"==========",old)
+ if (news != old) {
this.getPrice()
}
}
@@ -576,11 +544,30 @@
}
},
methods: {
+ clearFormParam(){
+ this.form.startDate = ''
+ this.form.address = ''
+ this.form.endDate = ''
+ this.form.latitude = ''
+ this.form.longitude = ''
+ this.form.location = ''
+ this.form.locationEnd = ''
+ this.form.wayInfoDTOList = []
+ this.form.workType = 0
+ this.form.days = ''
+ this.form.locationRemark = ''
+ this.form.supplement = ''
+ this.form.multifileList = []
+ this.form.estimatedAccount = ''
+ this.form.price = ''
+ this.viewStatus = false
+ this.clearAll()
+ },
clear(index) {
this.orderFood[index].num = ''
this.orderFood[index].list.forEach(item => {
item.active = false
- })
+ })
},
clearAll() {
this.orderFood.forEach(p=>{
@@ -627,7 +614,7 @@
var that = this;
this.show1 = false
uni.requestSubscribeMessage({
- tmplIds: ['tDpYImlrdv-0d3euTrHbYZ1cEZvjVHTNlqHvV0tpLHg'],
+ tmplIds: ['AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8','3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk','tDpYImlrdv-0d3euTrHbYZ1cEZvjVHTNlqHvV0tpLHg'],
success(res) {
that.getaccept()
},
@@ -704,6 +691,7 @@
valid =false
}
cateringDTOList.push({
+ id:item.id,
name: item.name,
num: item.num,
price: child.price * 100
@@ -724,7 +712,7 @@
return uni.showToast({ title: '璇疯緭鍏ヨ仈绯荤數璇�', icon: 'none' })
}
uni.requestSubscribeMessage({
- tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg'],
+ tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg','AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8'],
success(res) {
that.$u.api.release({
...that.form,
@@ -737,6 +725,7 @@
cateringDTOList
}).then(res => {
if (res.code == 200) {
+ that.clearFormParam();
wx.requestPayment({
timeStamp: res.data.object.timeStamp,
nonceStr: res.data.object.nonceStr,
@@ -804,6 +793,8 @@
that.form.estimatedAccount = res.data
}
})
+ }else{
+ that.form.estimatedAccount = 0
}
},
addAddr() {
@@ -1754,6 +1745,44 @@
margin-top: 30rpx;
}
}
+ .nav-scroll {
+ white-space: nowrap; /* 闃叉瀵艰埅椤规崲琛� */
+ margin-bottom: 50rpx;
+ height: 66rpx;
+ overflow: auto; /* 鍏佽婊氬姩鏉″嚭鐜� */
+ .nav-item {
+ display: inline-block; /* 浣垮鑸」姘村钩鎺掑垪 */
+ margin-right: 60rpx;
+ position: relative;
+ text {
+ font-weight: 400;
+ font-size: 30rpx;
+ color: #666666;
+ }
+ .nav-item-x {
+ width: 40rpx;
+ height: 6rpx;
+ position: absolute;
+ bottom: -10rpx;
+ left: 50%;
+ transform: translate(-50%, 0);
+ background: #FF5A40;
+ border-radius: 3rpx;
+ }
+ // padding: 10px 20px; /* 璁剧疆鍐呰竟璺� */
+ // margin-right: 10px; /* 璁剧疆鍙宠竟璺� */
+ // background-color: #f0f0f0; /* 璁剧疆鑳屾櫙鑹� */
+ // border: 1px solid #ddd; /* 璁剧疆杈规 */
+ // border-radius: 5px; /* 璁剧疆鍦嗚 */
+ }
+ .active {
+ text {
+ font-weight: 600 !important;
+ font-size: 32rpx !important;
+ color: #222222 !important;
+ }
+ }
+ }
.box-hz-cate {
width: 100%;
display: flex;
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index 98fb261..26843f6 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -4,13 +4,16 @@
宸插彇娑�
</view> -->
<view class="order-head" :style="{ backgroundImage: 'url(' + bgImg + ')' }">
- <view class="order-head-status">{{info.statusName || ''}}</view>
- <view class="order-head-info">{{getStatusInfo()}}</view>
+ <view class="order-head-status">{{info.statusName || ''}}</view>
+ <view class="order-head-info" v-if="userInfo.id === info.acceptMemberId && info.isUpdate ==1" style="color: red;">
+ 璁㈠崟淇℃伅宸蹭慨鏀癸紝璇峰強鏃剁‘璁わ紝{{timeInfo}}鍚庡皢鑷姩鍚屾剰
+ </view>
+ <view class="order-head-info" v-else >{{getStatusInfo()}}</view>
</view>
<view class="order-quxiao">
<view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.acceptMemberId && info.status ===2">鍙栨秷璁㈠崟</view>
- <view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 || info.status ===1|| info.status ===2)">鍙栨秷璁㈠崟</view>
- <view class="order-quxiao-btn1" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 || info.status ===1|| info.status ===2)" @click="jumpEdit()">淇敼璁㈠崟</view>
+ <view class="order-quxiao-btn" @click="show = true" v-if="userInfo.id === info.releaseMemberId && info.isUpdate!=1 && info.status ===2">鍙栨秷璁㈠崟</view>
+ <view class="order-quxiao-btn1" v-if="userInfo.id === info.releaseMemberId && info.type!=2 && info.isUpdate!=1 && info.status ===2 " @click="jumpEdit()">淇敼璁㈠崟</view>
</view>
<view class="order-user" v-if="userInfo.id === info.releaseMemberId && info.acceptMemberId">
<view class="order-user-info">
@@ -21,7 +24,7 @@
</view>
<view class="user-info-l-i">
<view class="user-info-l-i-top">
- <text>{{info.acceptName || '鍖垮悕'}}</text>
+ <text>{{info.acceptName || ''}}</text>
<view class="user-info-l-i-top-jdf">鎺ュ崟鏂�</view>
</view>
<view class="user-info-l-i-bottom">
@@ -50,7 +53,7 @@
<text v-if="info.type===2">璁㈤鍗�</text>
</view>
- <view v-if="info.type===0" class="order-info-wz">{{info.categoryName || ''}}锝渰{info.priceNum1 || '' }}鏂�</view>
+ <view v-if="info.type===0" class="order-info-wz">{{info.categoryName || ''}}锝渰{info.priceNum1 || '' }}{{info.workType === 0?'鏂�':'浜�'}}</view>
<view v-if="info.type===1" class="order-info-wz">{{info.transportTypeName || ''}}{{' | '}}{{info.transportNum || '' }}{{info.transportUnit||''}}{{' | '}}闇�{{info.priceNum2 || '' }}杈�</view>
<view class="order-info-address">
<image src="/static/icon/order_ic_location@2x.png" mode="widthFix"></image>
@@ -126,7 +129,7 @@
<image v-if="info.releaseCoverImage" :src="info.releaseCoverImage" mode="widthFix"></image>
<image v-else src="/static/icon/img@2x.png" mode="widthFix"></image>
</view>
- <text>{{info.releaseName || '鍖垮悕'}}</text>
+ <text>{{info.releaseName || ''}}</text>
<view class="order-ren-left-tip">涓氫富</view>
</view>
<view class="order-ren-x"></view>
@@ -176,20 +179,20 @@
</view>
<view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));" v-if="![99].includes(info.status)"></view>
<view class="order-footer" v-if="![99].includes(info.status)">
- <template v-if="(userInfo.id === info.releaseMemberId) && info.status ===2">
+ <template v-if="(userInfo.id === info.releaseMemberId) && info.isUpdate!=1 &&info.status ===2">
<sunui-mverify hint="寮�濮嬩綔涓�" @change="getaccept($event)"></sunui-mverify>
</template>
<view class="order-footer-btn" v-else>
- <view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.acceptMemberId && info.status ===2">鍙栨秷璁㈠崟</view>
+ <view class="order-footer-btn-a" @click="show = true" v-if="1==2&& userInfo.id === info.acceptMemberId && info.status ===2">鍙栨秷璁㈠崟</view>
<view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 || info.status ===1|| info.status ===2)">鍙栨秷璁㈠崟</view>
<view class="order-footer-btn-b" @click="show2=true" v-if="userInfo.id === info.releaseMemberId && (info.status ===4 && info.commentStatus!=1)">鍘昏瘎浠�</view>
<view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId &&((info.status ===3 && info.type !==2)|| (info.status ===0 && info.type===2))" @click="show1 = true">{{info.type === 2 ? '缁х画鏀粯' : '瀹屾垚骞舵敮浠�'}}</view>
<view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId && ((info.status ===3 && info.type===2))" @click="payment1">瀹屾垚浣滀笟</view>
- <view class="order-footer-btn-b" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 || info.status ===1|| info.status ===2)" @click="jumpEdit()">淇敼璁㈠崟</view>
+ <view class="order-footer-btn-b" v-if="info.type !=2 && info.isUpdate!=1&& userInfo.id === info.releaseMemberId && (info.status ===0 || info.status ===1|| info.status ===2)" @click="jumpEdit()">淇敼璁㈠崟</view>
<view class="order-footer-btn-b" @click="show5 =true" v-if="userInfo.id === info.acceptMemberId && (info.isUpdate==1 && info.status ===2)">淇敼纭</view>
- <view class="order-footer-btn-b" @click="startJobs()" v-if="userInfo.id === info.releaseMemberId && (info.status ===2)">寮�濮嬩綔涓�</view>
+ <!-- <view class="order-footer-btn-b" @click="startJobs()" v-if="userInfo.id === info.releaseMemberId && (info.status ===2)">寮�濮嬩綔涓�</view> -->
<view class="order-footer-btn-b" @click="show6 =true" v-if="userInfo.id !== info.releaseMemberId && (info.status ===1)">鎶㈠崟</view>
</view>
<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
@@ -268,7 +271,7 @@
</view>
<view class="zhifu-c-info1">鏀粯閲戦锛�</view>
<view class="zhifu-c-input">
- <image src="/static/icon/楼@2x.png" mode="widthFix"></image>
+ <image src="/static/icon/ic_money@2x.png" mode="widthFix"></image>
<input type="number" v-model="amount" :disabled="info.type === 2" placeholder="璇疯緭鍏�" />
</view>
</view>
@@ -314,9 +317,12 @@
show2: false,
count: 5,
show3:false,
+ timer:null,
show4:false,
show5:false,
show6:false,
+ timeInfo:'00:00:00',
+ lessTime:null,
value:0,
wayList:[],
bgImg: require('@/static/image/bg_green@2x.png'),
@@ -330,7 +336,9 @@
onLoad(options) {
console.log(options)
var id = options.id
- this.id = id
+ this.id = id
+ },
+ onShow(options) {
this.getOrderData()
},
methods:{
@@ -530,6 +538,9 @@
}else if(this.info.status === 1){
return ''
}else if(this.info.status === 2){
+ if(this.info.isUpdate==1){
+ return ''
+ }
return '鎮ㄥ凡鎺ュ崟锛岃鎸夋椂瀹屾垚璁㈠崟浠诲姟'
}else if(this.info.status === 3){
return '璁㈠崟杩涜涓紝璇锋寜鏃跺畬鎴愯鍗曚换鍔�'
@@ -545,7 +556,10 @@
}else if(this.info.status === 1){
return '鎮ㄨ鍗曞凡缁忔垚鍔熷彂璧凤紝璇疯�愬績绛夊緟鎺ュ崟'
}else if(this.info.status === 2){
- return '璁㈠崟寮�濮嬩綔涓氬悗锛岃鎷栧姩涓嬫柟鈥滃紑濮嬩綔涓氣�濇寜'
+ if(this.info.isUpdate==1){
+ return '璁㈠崟宸蹭慨鏀癸紝璇风瓑寰呮帴鍗曟柟纭'
+ }
+ return '璁㈠崟宸叉帴鍗曪紝璇锋嫋鍔ㄤ笅鏂光�滃紑濮嬩綔涓氣�濇寜閽�'
}else if(this.info.status === 3){
return this.info.type!=2?'璁㈠崟瀹屾垚鍚庤鐐瑰嚮涓嬫柟鈥滃畬鎴愬苟鏀粯鈥濇寜閽�':'璁㈠崟姝ｅ湪杩涜涓�'
}else if(this.info.status === 4){
@@ -554,6 +568,21 @@
return '璁㈠崟宸插彇娑�'
}
}
+ },
+ updateTimeInfo(){
+ if(this.timer){
+ clearInterval(this.timer)
+ }
+ var that =this
+ this.lessTime = Math.floor( Number(that.info.confirmCountdown || 0)/1000) ;
+ this.timer = setInterval(function(){
+ let h = Math.floor(that.lessTime/60/60) ;
+ let m = Math.floor((that.lessTime - h*60*60)/60);
+ let s= Math.floor(that.lessTime- h*60*60 -m*60);
+ that.timeInfo =(h<10?'0':'')+ h+":"+(m<10?'0':'')+m+":"+(s<10?'0':'')+s;
+ that.lessTime =that.lessTime-1;
+ // console.log( that.timeInfo)
+ },1000)
},
getOrderData(){
var that = this
@@ -566,6 +595,9 @@
if(that.info.wayInfo){
that.wayList = JSON.parse(that.info.wayInfo)
}
+ if(res.data.isUpdate == 1){
+ that.updateTimeInfo()
+ }
}else{
uni.showToast({ title: '璁㈠崟淇℃伅涓嶅瓨鍦�', icon: 'error', duration: 2000 });
}
diff --git a/small-program/pages/packaging-worker/packaging-worker.vue b/small-program/pages/packaging-worker/packaging-worker.vue
index 8754687..648fa1b 100644
--- a/small-program/pages/packaging-worker/packaging-worker.vue
+++ b/small-program/pages/packaging-worker/packaging-worker.vue
@@ -18,7 +18,7 @@
<view class="list-item-row" @click="selectAddress()">
<view class="list-item-row-label">鐢ㄥ伐鍦扮偣<b>*</b></view>
<view class="list-item-row-val">
- <text>{{form.location ? form.location : '璇烽�夋嫨'}}</text>
+ <text style="width:80%;">{{form.location ? form.location : '璇烽�夋嫨'}}</text>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
diff --git a/small-program/pages/sorting/sorting.vue b/small-program/pages/sorting/sorting.vue
index 770cdaf..f311203 100644
--- a/small-program/pages/sorting/sorting.vue
+++ b/small-program/pages/sorting/sorting.vue
@@ -17,7 +17,7 @@
<view class="list-item-row" @click="selectAddress()">
<view class="list-item-row-label">鐢ㄥ伐鍦扮偣<b>*</b></view>
<view class="list-item-row-val">
- <text>{{form.location ? form.location : '璇烽�夋嫨'}}</text>
+ <text style="width:80%;">{{form.location ? form.location : '璇烽�夋嫨'}}</text>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
diff --git a/small-program/pages/using-workers/using-workers.vue b/small-program/pages/using-workers/using-workers.vue
index 1294eec..28b762e 100644
--- a/small-program/pages/using-workers/using-workers.vue
+++ b/small-program/pages/using-workers/using-workers.vue
@@ -17,7 +17,7 @@
<view class="list-item-row" @click="selectAddress()">
<view class="list-item-row-label">鐢ㄥ伐鍦扮偣<b>*</b></view>
<view class="list-item-row-val">
- <text>{{form.location ? form.location : '璇烽�夋嫨'}}</text>
+ <text style="width:80%;">{{form.location ? form.location : '璇烽�夋嫨'}}</text>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
@@ -85,7 +85,7 @@
<view class="list-item-row">
<view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
<view class="list-item-row-val">
- <input v-model="form.price" type="number" @blur="getPrice" placeholder="璇疯緭鍏�" />
+ <input v-model="form.price" type="digit" @blur="getPrice" placeholder="璇疯緭鍏�" />
<text>鍏�/鏂�</text>
</view>
</view>
@@ -189,7 +189,7 @@
},
modify: false,
cateList: [],
- viewStatus: false
+ viewStatus: true
};
},
onLoad(option) {
@@ -243,7 +243,7 @@
}
if (!that.form.id) {
uni.requestSubscribeMessage({
- tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg'],
+ tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg','AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8'],
success(res) {
that.$u.api.release({ ...that.form, price: Number(that.form.price) * 100 })
.then(res => {
@@ -256,9 +256,9 @@
}
})
} else {
- uni.requestSubscribeMessage({
- tmplIds: ['3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk'],
- success(res) {
+ // uni.requestSubscribeMessage({
+ // tmplIds: ['3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk'],
+ // success(res) {
that.$u.api.updateOrder({ ...that.form, price: Number(that.form.price) * 100 })
.then(res => {
if (res.code == 200) {
@@ -274,8 +274,8 @@
}, 1500)
}
})
- }
- })
+ // }
+ // })
}
},
// 璁＄畻閲戦
--
Gitblit v1.9.3