From 491249bdf736a5f7d50417c889ad2db734b12383 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期四, 07 九月 2023 10:22:07 +0800
Subject: [PATCH] 操作指引修改
---
api/publicInterface.js | 7
pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue | 16 +
api/globalApi.js | 6
pages/driver-page/drvier-my/drvier-my.vue | 79 +++++++-
pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue | 4
pages.json | 20 +-
pages/customer-page/customer-index/customer-index.vue | 124 ++++---------
pages/tabbar-page/index-tabbar/index-tabbar.vue | 6
pages/customer-page/customer-my/customer-my.vue | 41 ++++
pages/driver-page/driver-index/driver-index.vue | 171 ++++++++-----------
store/index.js | 7
11 files changed, 261 insertions(+), 220 deletions(-)
diff --git a/api/globalApi.js b/api/globalApi.js
index 081216d..d3ca4b8 100644
--- a/api/globalApi.js
+++ b/api/globalApi.js
@@ -429,4 +429,10 @@
url: '/wrzs/jcproduct/getSpec',
method: 'GET'
},
+ /**
+ * @description 鑾峰彇鐧诲綍鏃ュ織 濡傛灉绗竴娆＄櫥褰� 灏卞己鍒舵墦寮�鏂版墜鎸囧紩 */
+ getLogOn: {
+ url: 'admin/log/getLogOn',
+ method: 'GET'
+ }
}
\ No newline at end of file
diff --git a/api/publicInterface.js b/api/publicInterface.js
index 10470cc..7bd115b 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -61,8 +61,9 @@
carImg,
drivingImg,
vehicleColour,
- bodyOfCarJpg
+ bodyofcarJpg
}) {
+ console.log(bodyofcarJpg);
uni.showLoading({ title: '鍔犺浇涓�...' })
return new Promise((resolve, reject) => {
uni.request({
@@ -78,7 +79,9 @@
idCard,
carNo,
carImg,
- drivingImg
+ drivingImg,
+ vehicleColour,
+ bodyofcarJpg
},
header: {
'Authorization': 'Basic c29jaWFsOnNvY2lhbA==', //app:app
diff --git a/pages.json b/pages.json
index e37079a..aa5102a 100644
--- a/pages.json
+++ b/pages.json
@@ -147,7 +147,7 @@
"path": "pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice",
"style": {
"navigationBarTitleText": "绉伴噸",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": true
}
},
@@ -279,16 +279,14 @@
"enablePullDownRefresh": false
}
- } ,{
- "path" : "selectSpecifications/selectSpecifications",
- "style" :
- {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
-
- }
- ]
+ }, {
+ "path": "selectSpecifications/selectSpecifications",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }]
}, {
"root": "pages/driver-page/appointment",
"pages": [{
diff --git a/pages/customer-page/customer-index/customer-index.vue b/pages/customer-page/customer-index/customer-index.vue
index fc96467..b1c1aff 100644
--- a/pages/customer-page/customer-index/customer-index.vue
+++ b/pages/customer-page/customer-index/customer-index.vue
@@ -6,6 +6,25 @@
<view class="wait-collection"
:style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/customerbanner.png)`, backgroundSize: 'contain', backgroundRepeat: 'no-repeat' }">
</view>
+ <!-- 寮曞椤� -->
+ <view class="noob-tour"
+ v-if="roleType===4">
+ <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;top: -120px;">
<u-empty mode="data"
icon="http://cdn.uviewui.com/uview/empty/data.png"
@@ -138,50 +157,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="TourImgList"
+ :saveBtn='false'></previewImage>
+ </view>
</view>
<!-- 棰嗗彇寮瑰嚭妗� -->
<u-popup :show="show"
@@ -210,6 +192,7 @@
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';
export default {
props: {
orderPlanDataStore: {
@@ -218,7 +201,8 @@
}
},
components: {
- combinedTitle
+ combinedTitle,
+ previewImage
},
watch: {
orderPlanDataStore: {
@@ -263,7 +247,12 @@
onlineurl,
previewImageShow: false,
previewImageSrc: '',
- TourImgList: ['quality01.jpg', 'quality02.jpg', 'quality03.jpg', 'quality04.jpg', 'quality05.jpg'],
+ TourImgList: ['https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality01.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality02.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality03.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality04.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality05.jpg'
+ ],
imgIndex: 0,
startX: 0, // 瑙︽懜璧峰鐐圭殑X鍧愭爣
endX: 0, // 瑙︽懜缁撴潫鐐圭殑X鍧愭爣
@@ -402,47 +391,8 @@
.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
- })
- },
- 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() {},
+ this.$refs.previewImage.open('https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality01.jpg')
+ }
}
};
</script>
@@ -576,7 +526,9 @@
}
.noob-tour {
- margin-bottom: vww(80);
+ margin-bottom: vww(10);
+ position: relative;
+ top: -120px;
}
.u-popup {
diff --git a/pages/customer-page/customer-my/customer-my.vue b/pages/customer-page/customer-my/customer-my.vue
index a2d91a3..e41ecbb 100644
--- a/pages/customer-page/customer-my/customer-my.vue
+++ b/pages/customer-page/customer-my/customer-my.vue
@@ -79,6 +79,30 @@
type="primary"
@click="logout()"></u-button></view>
</view>
+ <view class="noob-tour"
+ style="margin-top: 80rpx;"
+ v-if="roleType===4">
+ <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">
+ <previewImage ref="previewImage"
+ :imgs="TourImgList"
+ :saveBtn='false'></previewImage>
+ </view>
<u-toast ref="uToast"></u-toast>
<!-- 鏂板缓杞﹂槦寮瑰嚭妗� -->
<view class="addNewGroup">
@@ -152,10 +176,12 @@
<script>
import combinedTitle from '@/components/combined-title/combined-title.vue';
+ import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
import { customerId, redirectLogin } from '@/utils/status';
export default {
components: {
- combinedTitle
+ combinedTitle,
+ previewImage
},
data() {
return {
@@ -185,7 +211,13 @@
logoutTitle: '鎻愮ず',
logoutContent: '鏄惁纭閫�鍑�',
// 鐢ㄦ埛淇℃伅瀵硅薄
- userEntity: {}
+ userEntity: {},
+ TourImgList: ['https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality01.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality02.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality03.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality04.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality05.jpg'
+ ],
};
},
computed: {
@@ -371,6 +403,11 @@
uni.navigateTo({
url: '/pages/customer-page/customer-my/userMange/userMange'
});
+ },
+ noobTour() {
+ this.$nextTick(() => {
+ this.$refs.previewImage.open('https://mx.jzeg.cn:9095/appimg/image/tour/quality/quality01.jpg')
+ })
}
}
};
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
index cc8e129..db2e681 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighingDevice/weighingDevice.vue
@@ -251,12 +251,26 @@
deep: true
}
},
+ onPullDownRefresh() {
+ if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
+ if (!this.is_open_socket) {
+ this.$store.dispatch('websocketInit')
+ this.changeisconnect(false);
+ console.log('绉伴噸鐨剋s');
+ uni.stopPullDownRefresh();
+ } else {
+ uni.stopPullDownRefresh();
+ }
+ }
+ },
onShow() {
this.init();
// this.realTimeWeigh = 0
},
computed: {
- ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning']),
+ ...mapState(['globalweigh', 'globalinfraredStatus', 'globalWarning', 'globalisconnect', 'globalisUploadimg',
+ 'globalisLogin', 'is_open_socket'
+ ]),
token() {
return uni.getStorageSync('token');
},
diff --git a/pages/driver-page/driver-index/driver-index.vue b/pages/driver-page/driver-index/driver-index.vue
index 8d9eed3..095cf35 100644
--- a/pages/driver-page/driver-index/driver-index.vue
+++ b/pages/driver-page/driver-index/driver-index.vue
@@ -6,6 +6,25 @@
<view class="wait-collection"
:style="{ backgroundImage: `url(${onlineurl}/appimg/image/banner/diverbanner.png)`, backgroundSize: 'contain', backgroundRepeat: 'no-repeat' }">
</view>
+ <!-- 寮曞椤� -->
+ <view class="noob-tour"
+ v-if="roleType===3&&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 class="collection-form">
<view class="collection-form-item"
v-for="(item, index) in driverBillOfLoadingData.list1"
@@ -226,52 +245,11 @@
</view>
<view class="white-block"></view>
</view>
-
- <!-- 寮曞椤� -->
- <view class="noob-tour">
- <combined-title title="鎿嶄綔鎸囧紩"></combined-title>
- <u-cell-group>
- <u-cell v-if="roleType===3"
- 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/driver/'+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>
+ <previewImage ref="previewImage"
+ :imgs="TourImgList"
+ :saveBtn='false'></previewImage>
</view>
</view>
</view>
@@ -282,9 +260,12 @@
import { customerId } from '@/utils/status';
import combinedTitle from '@/components/combined-title/combined-title.vue';
import { onlineurl } from '@/api/request.js'
+ import { BaseUrl } from '@/api/publicInterface.js'
+ import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
export default {
components: {
- combinedTitle
+ combinedTitle,
+ previewImage
},
props: {
indexdriverBillOfLoadingData: {
@@ -299,17 +280,12 @@
},
deep: true,
immediate: true
- }
+ },
},
computed: {
roleType() {
return uni.getStorageSync('roleType');
},
- imageStyle() {
- return {
- transition: this.transition ? 'transform 0.3s ease' : 'none'
- }
- }
},
data() {
return {
@@ -328,13 +304,16 @@
customerId: '',
coalStatus: ['鏈О閲�', '绉伴噸涓�', '楠岃川涓�', '绉伴噸瀹屾垚', '楠岃川瀹屾垚'],
onlineurl,
- previewImageShow: false,
- previewImageSrc: '',
- TourImgList: ['sj1.jpg', 'sj2.jpg', 'sj3.jpg', 'sj4.jpg', 'sj5.jpg', 'sj6.jpg', 'sj7.jpg'],
- imgIndex: 0,
- startX: 0, // 瑙︽懜璧峰鐐圭殑X鍧愭爣
- endX: 0, // 瑙︽懜缁撴潫鐐圭殑X鍧愭爣
- transition: false
+ TourImgList: ['https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj1.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj2.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj3.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj4.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj5.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj6.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj7.jpg'
+ ],
+ phone: "",
+ isFirstLogin: true //鏄惁鏄涓�娆＄櫥褰�
};
},
onShow() {
@@ -351,6 +330,7 @@
},
init() {
this.qiangDanList();
+ this.getLogOn()
},
// 鍙告満棣栭〉鍒楄〃
qiangDanList() {
@@ -423,48 +403,29 @@
url: `/pages/driver-page/appointment/appointment?takeCoalId=${value.id}&filedId=${value.filedId}&deptId=${value.deptId}&sendDate=${value.sendDate}`
});
},
- noobTour(v) {
- this.$nextTick(() => {
- this.previewImageShow = true
- this.imgIndex = 0
+ noobTour() {
+ this.$refs.previewImage.open('https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj1.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 => {
+ console.log(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>
@@ -546,6 +507,16 @@
text-align: center;
line-height: vww(40);
}
+ }
+
+ .fade-enter-active,
+ .fade-leave-active {
+ transition: opacity 0.5s;
+ }
+
+ .fade-enter,
+ .fade-leave-to {
+ opacity: 0;
}
.exceedHide {
@@ -955,7 +926,9 @@
}
.noob-tour {
- margin-bottom: vww(50);
+ margin-bottom: vww(10);
+ position: relative;
+ top: -240rpx;
}
.u-popup {
diff --git a/pages/driver-page/drvier-my/drvier-my.vue b/pages/driver-page/drvier-my/drvier-my.vue
index 27c9a74..c03d621 100644
--- a/pages/driver-page/drvier-my/drvier-my.vue
+++ b/pages/driver-page/drvier-my/drvier-my.vue
@@ -116,16 +116,22 @@
mode="widthFix"></image>
<view class="label-text">杞﹀ご杞﹀熬杞﹁韩鐓х墖</view>
</view>
- <view class="img-container"
- v-for="item in userInfo.bodyCarImg">
- <u--image :showLoading="true"
- :src="BaseUrl+item"
- width="80px"
- height="80px"
- @click="imageClickCarBody(item)">
- <view slot="error"
- style="font-size: 24rpx;">鍔犺浇澶辫触</view>
- </u--image>
+ <view class="img-container special">
+ <view class="img-container_item"
+ v-for="item in userInfo.bodyCarImg">
+ <u--image :showLoading="true"
+ :src="BaseUrl+item"
+ width="80px"
+ height="80px"
+ @click="imageClickCarBody(item)">
+ <view slot="error"
+ style="font-size: 24rpx;">鍔犺浇澶辫触</view>
+ </u--image>
+ </view>
+ </view>
+ <view style="display: flex;align-items: center;height: 100%; width: 150rpx;"
+ v-if='userInfo.bodyCarImg?(userInfo.bodyCarImg.length===0?true:false):true'>
+ 鏆傛棤鍥剧墖
</view>
</view>
<view class="car-img">
@@ -154,6 +160,31 @@
@click="logout"
shape="circle"
plain></u-button></view>
+ </view>
+ <!-- 寮曞椤� -->
+ <view class="noob-tour"
+ style="margin-top: 80rpx;">
+ <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">
+ <previewImage ref="previewImage"
+ :imgs="TourImgList"
+ :saveBtn='false'></previewImage>
</view>
<!-- 鍥剧墖棰勮寮瑰嚭妗� -->
@@ -326,7 +357,13 @@
import { BaseUrl } from '@/api/publicInterface.js';
import { mapMutations } from 'vuex';
import { onlineurl } from '@/api/request.js'
+ import combinedTitle from '@/components/combined-title/combined-title.vue';
+ import previewImage from '@/components/kxj-previewImage/kxj-previewImage.vue';
export default {
+ components: {
+ combinedTitle,
+ previewImage
+ },
data() {
return {
// 鑾峰彇鐨勫徃鏈鸿鎯�
@@ -475,6 +512,14 @@
name: '钃濊壊',
value: '钃濊壊'
}
+ ],
+ TourImgList: ['https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj1.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj2.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj3.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj4.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj5.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj6.jpg',
+ 'https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj7.jpg'
],
};
},
@@ -672,11 +717,8 @@
logoutCancel() {
this.logoutShow = false;
},
- // 璺宠浆鍙戣繍缁熻椤甸潰
- statistics() {
- uni.navigateTo({
- url: '/pages/customer-page/customer-my/faYunstatistics/faYunstatistics'
- });
+ noobTour() {
+ this.$refs.previewImage.open('https://mx.jzeg.cn:9095/appimg/image/tour/driver/sj1.jpg')
}
}
};
@@ -852,6 +894,13 @@
height: 50rpx;
}
}
+
+ .special {
+ width: 100%;
+ flex-wrap: wrap;
+ height: 100%;
+ @include flex;
+ }
}
}
}
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 330e9d4..44b4ce4 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -41,7 +41,6 @@
import freightForwarderIndex from '@/pages/freight-forwarder-page/freightForwarder-index/freightForwarder-index.vue';
import { mapState, mapMutations } from 'vuex';
import { webSocketUrl } from '@/api/request.js';
-
let socket = null;
export default {
components: {
@@ -138,7 +137,8 @@
},
isconnect: false,
dotShow: false,
- appHide: false
+ appHide: false,
+ phone: ''
};
},
watch: {
@@ -281,7 +281,7 @@
this.dotShow = filtermessage.length > 0;
}
});
- }
+ },
}
};
</script>
diff --git a/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue b/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
index b8e030b..a963a78 100644
--- a/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
+++ b/pages/tabbar-page/myPage-tabbar/myPage-tabbar.vue
@@ -43,6 +43,10 @@
break;
case 3:
this.$refs.driverMyRef.init();
+ break;
+ case 4:
+ this.$refs.customerMyPageRef.init();
+ break;
default:
break;
}
diff --git a/store/index.js b/store/index.js
index 71899fe..1ee03b7 100644
--- a/store/index.js
+++ b/store/index.js
@@ -108,7 +108,8 @@
reconnectTimeOut: null,
// 绉伴噸绋冲畾鎬� 0/绋冲畾 1/闈炵ǔ瀹� 闈炵ǔ瀹氭�佷笉鑳界偣绉伴噸
globalWarning: false,
- globalShowWeigh: []
+ globalShowWeigh: [],
+ isFirstLogin: true
},
mutations: {
lengthchange(state, payload) {
@@ -184,6 +185,10 @@
},
changeglobalShowWeigh(state, payload) {
state.globalShowWeigh = payload
+ },
+ changeisFirstLogin(state, payload) {
+ state.isFirstLogin = payload
+ console.log(state.isFirstLogin, '绗竴娆＄櫥褰�');
}
},
actions: {
--
Gitblit v1.9.1