From a1c569d40b5d1d6571a197467a41fd3421c393ce Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 09:10:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/index/index.vue | 104 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 79 insertions(+), 25 deletions(-)
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 119a4e7..15c8086 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -2,6 +2,10 @@
<view class="index">
<!-- 鎺ュ崟鏂� -->
<view class="index-j" v-if="userInfo && userInfo.useIdentity === 1">
+ <view class="kefubtn" @click="contactPhone()">
+ <image style="width: 36rpx;height: 36rpx" src="/static/icon/ic_kefu.png" mode="widthFix"></image>
+ <text>瀹㈡湇</text>
+ </view>
<view class="index-j-head">
<view :style="{ width: '100%', height: statusbarHeight + 'px' }"></view>
<view class="index-c-title" :style="{ height: navHeight + 'px' }">
@@ -61,7 +65,7 @@
<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>
+ <text>{{address.location}}</text>
</view>
</view>
<template v-if="[0, 2].includes(item.type)">
@@ -133,7 +137,7 @@
</view>
<view class="radio-item-list-data">
<text style="flex-shrink: 0;">浠芥暟锛�</text>
- <input type="number" v-model="item.num" placeholder="璇疯緭鍏�">
+ <input type="digit" v-model="item.num" placeholder="璇疯緭鍏�">
<text style="color: #999999;">浠�</text>
<view class="radio-item-list-data-btn" @click="clear(index)">鍙栨秷</view>
</view>
@@ -154,29 +158,30 @@
<input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
</view>
</view>
- <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row" >
<view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
<view class="list-item-row-val">
<textarea v-model="form.supplement" cols="30" rows="10" placeholder="璇疯緭鍏�" maxlength="200"></textarea>
</view>
</view>
- <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row" >
<view class="list-item-row-label">鍥剧墖</view>
<view class="list-item-row-upload">
- <view class="upload-item" v-if=" form.multifileList" 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" @click="preview(index, form.multifileList)">
<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>
+ <image class="upload-item-dele" @click.stop="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
</view>
<view class="upload-item" @click="uploadImg">
<u-icon name="plus" color="#999999" size="24"></u-icon>
<text>鐐瑰嚮涓婁紶</text>
</view>
+ <view style="width: 208rpx; height: 0;"></view>
</view>
</view>
- <view class="list-item-zk" @click="viewStatus = !viewStatus">
+ <!-- <view class="list-item-zk" @click="viewStatus = !viewStatus">
<text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
<u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
- </view>
+ </view> -->
</view>
<view class="list-item">
<view class="list-item-label">鑱旂郴浜轰俊鎭�</view>
@@ -329,7 +334,14 @@
<view class="phone">
<view class="phone-head">
<view></view>
- <text>瀹㈡湇鐢佃瘽</text>
+ <text>鑱旂郴瀹㈡湇</text>
+ </view>
+ <view class="phone-item">
+ <view>
+ <image style="width: 36rpx;height: 36rpx" src="/static/icon/ic_kefu.png" mode="widthFix"></image>
+ <button open-type="contact" plain="true" bindcontact="handleContact">鍦ㄧ嚎瀹㈡湇</button>
+ </view>
+ <view class="line" v-if="serverPhone && serverPhone.length"></view>
</view>
<view class="phone-item" v-if="serverPhone" v-for="(item,index) in serverPhone" :key="item" @click="contactPhoneDo(item)">
<view>
@@ -427,7 +439,7 @@
carRemark: '',
orderFood: [],
- viewStatus: false,
+ viewStatus: true,
form: {
startDate: '',
@@ -530,7 +542,7 @@
this.isLogin = false
console.log('鏈櫥闄�')
}
- this.payOrderId=null
+ // this.payOrderId=null
},
watch: {
typeId: {
@@ -572,13 +584,21 @@
}
},
methods: {
+ preview(current, arr) {
+ let urls = arr.map(item => item.url || item.fileurlFull)
+ uni.previewImage({ current, urls })
+ },
goOrderDetail(id){
uni.navigateTo({
- url: `/pages/order-details/order-details?id=`+id
+ url: '/pages/order-details/order-details?id='+id
})
- this.orderId=null
- this.payOrderId=null
- this.show2=false
+ var that =this
+ setTimeout(function(){
+ that.orderId=null
+ that.payOrderId=null
+ that.show2=false
+ },1000)
+
},
clearFormParam(){
this.form.startDate = ''
@@ -783,7 +803,7 @@
fail(err) {
that.payOrderId = res.data.id
that.show2=true
- console.log(err)
+ console.log("=====================", res.data.id,that.payOrderId,err)
}
})
}
@@ -1054,6 +1074,33 @@
border-radius: 44rpx;
}
.index-j {
+ .kefubtn{
+ background-color: white;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ position: fixed;
+ bottom: 100rpx;
+ flex-direction: column;
+ right:30rpx;
+ height: 88rpx;
+ width: 88rpx;
+ border: 1rpx solid #f2f2f2;
+ border-radius: 50%;
+ image{
+ width: 36rpx;
+ width: 36rpx;
+ }
+ text{
+ width: 44rpx;
+ height: 32rpx;
+ font-weight: 400;
+ font-size: 22rpx;
+ color: #222222;
+ line-height: 32rpx;
+ text-align: center;
+ }
+ }
width: 100%;
.index-j-head {
width: 100%;
@@ -1542,19 +1589,19 @@
width: 100%;
display: flex;
align-items: center;
+ justify-content: space-between;
flex-wrap: wrap;
padding: 30rpx 0;
box-sizing: border-box;
.upload-item {
- width: 156rpx;
- height: 156rpx;
+ width: 208rpx;
+ height: 208rpx;
display: flex;
align-items: center;
flex-direction: column;
justify-content: center;
background: #F8F9FB;
border-radius: 8rpx;
- margin-right: 20rpx;
border: 2rpx solid #EEEEEE;
position: relative;
&:last-child {
@@ -2044,17 +2091,24 @@
color: #222222;
}
}
-
- .phone > .phone-item:last-of-type {
- /* 鏍峰紡 */
- border-bottom:none !important;
- }
+
.phone-item {
width: 100%;
text-align: center;
- justify-content: space-between;
+ display: flex;
+ justify-content: center;
+ flex-direction: column;
// border-bottom: 1rpx solid #eeeeee;
line-height: 78rpx;
+ button{
+ border: 1rpx white solid;
+ display: inline;
+ width: 300rpx;
+ font-weight: 500;
+ font-size: 32rpx;
+ line-height: 32rpx;
+ color: #222222;
+ }
image{
width: 28rpx;
height: 28rpx;
--
Gitblit v1.9.3