From e7405bb543d28c8e81402e7219575b83146942d4 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期五, 15 九月 2023 09:55:20 +0800
Subject: [PATCH] 司机我的提交遗漏
---
pages/customer-page/customer-index/customer-index.vue | 153 ++++++++++++++++++++------------------------------
1 files changed, 61 insertions(+), 92 deletions(-)
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index fc96467..01a93c0 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -6,11 +6,32 @@
<view class="wait-collection"
:style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/customerbanner.png)`, backgroundSize: 'contain', backgroundRepeat: 'no-repeat' }">
</view>
- <view style="position: relative;top: -120px;">
+ <view style="height: 382rpx;width: 100%;"></view>
+ <!-- 寮曞椤� -->
+ <view class="noob-tour"
+ v-if="roleType===4&&isFirstLogin">
+ <combined-title title="鎿嶄綔鎸囧紩"></combined-title>
+ <u-cell-group>
+ <u-cell title="鏂版墜鎸囧紩"
+ name='1'
+ :clickable="true"
+ @click="noobTour">
+ <u-badge type="primary"
+ value="01"
+ slot='icon'></u-badge>
+ <u-icon slot="value"
+ name="arrow-right"
+ size="30"
+ color="#b8b8b8"></u-icon>
+ </u-cell>
+ </u-cell-group>
+ </view>
+ <view style="position: relative;">
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
+ text="鏆傛棤鏁版嵁"
v-if="orderPlanData.length == 0"></u-empty>
</view>
<view class="collection-form">
@@ -83,6 +104,7 @@
icon="http://cdn.uviewui.com/uview/empty/data.png"
textSize="30"
iconSize="1000"
+ text="鏆傛棤鏁版嵁"
v-if="historyCoalData.length == 0"></u-empty>
<view class="history-information"
v-for="(item, index) in historyCoalData"
@@ -138,50 +160,13 @@
</scroll-view>
</view>
</view>
- <!-- 寮曞椤� -->
- <view class="noob-tour">
- <combined-title title="鎿嶄綔鎸囧紩"></combined-title>
- <u-cell-group>
- <u-cell title="鏂版墜鎸囧紩"
- name='1'
- :clickable="true"
- @click="noobTour">
- <u-badge type="primary"
- value="01"
- slot='icon'></u-badge>
- <u-icon slot="value"
- name="arrow-right"
- size="30"
- color="#b8b8b8"></u-icon>
- </u-cell>
- </u-cell-group>
- </view>
<!-- 鍥剧墖棰勮寮瑰嚭妗� -->
<view class="previewImage-container">
- <u-popup :show="previewImageShow"
- mode="center"
- @close="previewImageClose"
- @open="previewImageOpen"
- :closeable='true'>
- <view class="image-container"
- @touchstart="touchStart"
- @touchmove="touchMove"
- @touchend="touchEnd">
- <u--image :src="onlineurl+'/appimg/image/tour/quality/'+TourImgList[imgIndex]"
- width="400px"
- height="700px"
- @click='closeImg'
- mode='widthFix'
- :style="imageStyle">
- <view slot="error"
- style="font-size: 48rpx;">鍔犺浇澶辫触</view>
- </u--image>
- <view class=""
- style="text-align: center;background-color: rgba(0, 0, 0, 0.5);color: white;">
- {{imgIndex+1}}/{{TourImgList.length}}寮�
- </view>
- </view>
- </u-popup>
+ <view class="previewImage-container">
+ <previewImage ref="previewImage"
+ :imgs="customerTourImgList"
+ :saveBtn='false'></previewImage>
+ </view>
</view>
<!-- 棰嗗彇寮瑰嚭妗� -->
<u-popup :show="show"
@@ -210,6 +195,9 @@
import { onlineurl } from '@/api/request.js'
import combinedTitle from '@/components/combined-title/combined-title.vue';
import { customerId } from '@/utils/status';
+ import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
+ import { BaseUrl } from '@/api/publicInterface.js'
+ import { mapState } from 'vuex'
export default {
props: {
orderPlanDataStore: {
@@ -218,7 +206,8 @@
}
},
components: {
- combinedTitle
+ combinedTitle,
+ previewImage
},
watch: {
orderPlanDataStore: {
@@ -230,6 +219,7 @@
}
},
computed: {
+ ...mapState(['customerTourImgList']),
roleType() {
return uni.getStorageSync('roleType');
},
@@ -263,11 +253,8 @@
onlineurl,
previewImageShow: false,
previewImageSrc: '',
- TourImgList: ['quality01.jpg', 'quality02.jpg', 'quality03.jpg', 'quality04.jpg', 'quality05.jpg'],
- imgIndex: 0,
- startX: 0, // 瑙︽懜璧峰鐐圭殑X鍧愭爣
- endX: 0, // 瑙︽懜缁撴潫鐐圭殑X鍧愭爣
- transition: false
+ phone: "",
+ isFirstLogin: true
};
},
onLoad() {},
@@ -279,6 +266,7 @@
this.GetOrderPlan();
this.getJhOrderPlanDataPage();
this.onlineurl = onlineurl;
+ this.getLogOn()
},
// 鑾峰彇鍙戣繍璁″垝鍒楄〃
GetOrderPlan() {
@@ -402,47 +390,27 @@
.navigateTo({ url: `/pages/driver-page/driver-index/bill-of-lading-details/selectOrderPlan/selectOrderPlan?index=${index}` });
},
noobTour(v) {
- this.$nextTick(() => {
- this.previewImageShow = true
- this.imgIndex = 0
+ this.$refs.previewImage.open('https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality1.jpg')
+ },
+ getLogOn() {
+ this.$reqGet('getUserEntity').then(res => {
+ this.phone = res.data.phone
+ }).then(() => {
+ uni.request({
+ url: `${BaseUrl}/admin/log/getLogOnType?phone=${this.phone}`,
+ success: res => {
+ // res.data.data 涓�1 浠ｈ〃绗竴娆＄櫥褰� 涓�0鍙栨秷瀛︿範鎸囧紩 涓�2浠ｈ〃瀛樺湪
+ if (res.data.data === 1) {
+ this.noobTour()
+ } else if (res.data.data === 2) {
+ this.isFirstLogin = true
+ } else {
+ this.isFirstLogin = false
+ }
+ }
+ });
})
},
- touchStart(event) {
- this.startX = event.touches[0].clientX;
- },
-
- touchMove(event) {
- this.endX = event.touches[0].clientX;
- },
- touchEnd(event) {
- const startX = this.startX;
- const endX = this.endX;
- if (startX - endX > 50 && this.imgIndex < this.TourImgList.length - 1) {
- this.transition = true;
- this.imgIndex++
- setTimeout(() => {
- this.transition = false;
- }, 300);
- } else if (endX - startX > 50 && this.imgIndex > 0) {
- this.transition = true;
- this.imgIndex--
- setTimeout(() => {
- this.transition = false;
- }, 300);
- } else if (this.imgIndex === this.TourImgList.length - 1) {
- return this.$u.toast('杩欐槸鏈�鍚庝竴寮犱簡鍝�')
- }
- },
- closeImg() {
- this.previewImageShow = false;
- },
- /**
- * @preview 棰勮鍥剧墖
- */
- previewImageClose() {
- this.previewImageShow = false;
- },
- previewImageOpen() {},
}
};
</script>
@@ -458,7 +426,7 @@
.wait-collection {
width: 100%;
height: 600rpx;
- position: relative;
+ position: fixed;
top: vww(-10);
z-index: 0;
}
@@ -482,7 +450,7 @@
.history-numbers {
width: 100%;
position: relative;
- top: vww(-110);
+ // top: vww(-110);
.history-information {
width: 690rpx;
@@ -576,7 +544,8 @@
}
.noob-tour {
- margin-bottom: vww(80);
+ margin-bottom: vww(30);
+ position: relative;
}
.u-popup {
@@ -606,7 +575,7 @@
width: vww(345);
margin: 0 vww(15);
position: relative;
- top: vww(-144);
+ // top: vww(-144);
.collection-form-item {
width: 690rpx;
--
Gitblit v1.9.1