From f52085a9bc8c61cf7097426d7a6b2985d890da68 Mon Sep 17 00:00:00 2001
From: qingyiay <2386314947@qq.com>
Date: 星期三, 12 七月 2023 16:52:34 +0800
Subject: [PATCH] 增加用户隐私协议，验质增加字段，优化ws
---
api/publicInterface.js | 4
pages/login/login.vue | 39 ++++++
pages/register/register.vue | 53 ++++++--
pages.json | 11 +
pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue | 116 ++++++++++++++++--
pages/login/PrivacyAgreementText/PrivacyAgreementText.vue | 123 ++++++++++++++++++++
pages/tabbar-page/index-tabbar/index-tabbar.vue | 1
App.vue | 12 +
8 files changed, 319 insertions(+), 40 deletions(-)
diff --git a/App.vue b/App.vue
index 758985e..e7e6c3c 100644
--- a/App.vue
+++ b/App.vue
@@ -10,17 +10,19 @@
},
onShow() {
console.log('appvue鏄剧ず');
- if (!this.globalisconnect && !this.globalisUploadimg) {
- this.$store.dispatch('websocketInit')
- this.changeisconnect(false);
- console.log('appvue鐨剋s');
+ if (!this.globalisconnect && !this.globalisUploadimg && this.globalisLogin) {
+ if (!this.is_open_socket) {
+ this.$store.dispatch('websocketInit')
+ this.changeisconnect(false);
+ console.log('appvue鐨剋s');
+ }
}
},
methods: {
...mapMutations(['changeisconnect'])
},
computed: {
- ...mapState(['globalisconnect', 'globalisUploadimg', 'globalisLogin'])
+ ...mapState(['globalisconnect', 'globalisUploadimg', 'globalisLogin', 'is_open_socket'])
}
};
</script>
diff --git a/api/publicInterface.js b/api/publicInterface.js
index 4cd5dfd..10470cc 100644
--- a/api/publicInterface.js
+++ b/api/publicInterface.js
@@ -59,7 +59,9 @@
idCard,
carNo,
carImg,
- drivingImg
+ drivingImg,
+ vehicleColour,
+ bodyOfCarJpg
}) {
uni.showLoading({ title: '鍔犺浇涓�...' })
return new Promise((resolve, reject) => {
diff --git a/pages.json b/pages.json
index 399eee8..37dfe0e 100644
--- a/pages.json
+++ b/pages.json
@@ -225,7 +225,16 @@
}
}
- ],
+ ,{
+ "path" : "pages/login/PrivacyAgreementText/PrivacyAgreementText",
+ "style" :
+ {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+
+ }
+ ],
"subPackages": [{
"root": "pages/register",
"pages": [{
diff --git a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
index 5d790c9..31f08ce 100644
--- a/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
+++ b/pages/driver-page/driver-index/bill-of-lading-details/weighDetail/weighDetail.vue
@@ -68,6 +68,30 @@
v-model="item.num"></u--input>
</view>
</view>
+ <view class="notice-num">
+ <view class="num-text">
+ <u--text text=" 涓嶅悎鏍煎搧鍚�"
+ size='32'></u--text>
+ </view>
+ <view class="num-input">
+ <u--input placeholder="璇疯緭鍏� 涓嶅悎鏍煎搧鍚�"
+ border="bottom"
+ clearable
+ v-model="item.unqualifiedBreed"></u--input>
+ </view>
+ </view>
+ <view class="notice-num">
+ <view class="num-text">
+ <u--text text=" 涓嶅悎鏍奸噸閲�"
+ size='32'></u--text>
+ </view>
+ <view class="num-input">
+ <u--input placeholder="璇疯緭鍏ヤ笉鍚堟牸閲嶉噺"
+ border="bottom"
+ clearable
+ v-model="item.unqualifiedWeight"></u--input>
+ </view>
+ </view>
<view class="level"
v-if='!flag'>
<view class=""
@@ -82,16 +106,29 @@
</view>
<view class="level"
v-if='item.modifygoodsName||flag'>
- <view style="width: 220rpx;">
- <u--text text="鍝佸悕涓庤鏍间慨鏀�"
+ <view style="width: 200rpx;">
+ <u--text text="鍝佸悕涓庤鏍�"
size='32'></u--text>
</view>
<view v-if="showWeighCopy[i].modifyProductName||item.breed&&item.spec">
<u-tag :text="!flag?showWeighCopy[i].modifyProductName:item.breed+item.spec"
- v-if="showWeighCopy[i].modifyProductName"
plain
@click="productNamePopoverShow(i)"></u-tag>
</view>
+ </view>
+ <view class=""
+ style="margin-top: 8rpx;">
+ <u-upload :fileList="item.fileList"
+ deletable
+ @afterRead="afterRead"
+ @delete="deletePic"
+ :name="i"
+ multiple
+ :maxCount="4"
+ width="250"
+ height="150"
+ :previewFullImage="true">
+ </u-upload>
</view>
<!-- 鐗╄祫鏄庣粏 -->
<u-action-sheet :actions="goodsList"
@@ -123,6 +160,7 @@
</template>
<script>
+ import { BaseUrl } from '@/api/publicInterface.js';
import { onlineurl } from '@/api/request.js'
export default {
data() {
@@ -147,26 +185,23 @@
havedInput: false,
flag: false,
orderCode: null,
-
modifyProductName: null,
// 鏄惁淇敼
- isModify: false
+ isModify: false,
+ // 涓婁紶鍥剧墖
+ fileList1: [],
+
};
},
computed: {
roleType() {
return uni.getStorageSync('roleType')
- }
+ },
},
onLoad(params) {
- this.orderPlanId = params.orderPlanId ? params.orderPlanId : ''
- this.flag = params.flag ? params.flag : false
- },
- onShow() {
+ this.orderPlanId = params.orderPlanId ? params.orderPlanId : '';
+ this.flag = params.flag ? params.flag : false;
this.roleType === 1 ? this.GetOrderPlan() : this.getTakeCoal()
- if (this.orderCode) {
- this.getMaterialDetailByOrderCode()
- }
this.getJcProductList()
},
methods: {
@@ -184,8 +219,8 @@
return {
...v,
modifyProductName: '',
- modifygoodsName: ''
-
+ modifygoodsName: '',
+ fileList: []
}
})
this.showWeighCopy = JSON.parse(JSON.stringify(this.showWeigh))
@@ -240,7 +275,9 @@
return {
...v,
breed: this.showWeighCopy[i].modifyProductName ? this.showWeighCopy[i].breed : v.breed,
- spec: this.showWeighCopy[i].modifyProductName ? this.showWeighCopy[i].spec : v.spec
+ spec: this.showWeighCopy[i].modifyProductName ? this.showWeighCopy[i].spec : v.spec,
+ inspectionJpg: v.fileList.join(',')
+
}
})
this.$reqPost('updateTmTaskCoalItem', this.showWeigh, 'json').then(
@@ -296,7 +333,52 @@
discountInputHandle(value, index, clean) {
this.showWeigh[index].cinderWeight = Number(value)
this.showWeigh[index].weight = (clean - (Number(value)).toFixed(2));
- }
+ },
+ // 鍒犻櫎鍥剧墖
+ deletePic(event) {
+ this.showWeigh[event.name].fileList.splice(event.index, 1);
+ // this[`fileList${event.name}`].splice(event.index, 1);
+ },
+ // 鏂板鍥剧墖
+ async afterRead(event) {
+ // 褰撹缃� mutiple 涓� true 鏃�, file 涓烘暟缁勬牸寮忥紝鍚﹀垯涓哄璞℃牸寮�
+ let lists = [].concat(event.file);
+ let fileListLen = this.showWeigh[event.name].fileList.length;
+ lists.map(item => {
+ this.showWeigh[event.name].fileList.push({
+ ...item,
+ status: 'uploading',
+ message: '涓婁紶涓�'
+ });
+ });
+ for (let i = 0; i < lists.length; i++) {
+ const result = await this.uploadFilePromise(lists[i].url, event.name);
+ let item = this.showWeigh[event.name].fileList[fileListLen];
+ this.showWeigh[event.name].fileList.splice(
+ fileListLen,
+ 1,
+ Object.assign(item, {
+ status: 'success',
+ message: '涓婁紶鎴愬姛',
+ url: result
+ })
+ );
+ fileListLen++;
+ }
+ },
+ uploadFilePromise(url, num) {
+ return new Promise((resolve, reject) => {
+ let a = uni.uploadFile({
+ url: BaseUrl + '/admin/sys-file/uploadUnToken',
+ filePath: url,
+ name: 'file',
+ formData: {},
+ success: res => {
+ resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+ }
+ });
+ });
+ },
},
}
</script>
diff --git a/pages/login/PrivacyAgreementText/PrivacyAgreementText.vue b/pages/login/PrivacyAgreementText/PrivacyAgreementText.vue
new file mode 100644
index 0000000..8fbcdc7
--- /dev/null
+++ b/pages/login/PrivacyAgreementText/PrivacyAgreementText.vue
@@ -0,0 +1,123 @@
+<template>
+ <view class="main">
+ <view class="title">
+ 闅愮鍗忚
+ </view>
+ <view class="illustrate">
+ 娆㈣繋浣跨敤鏃犱汉鍊煎畧灏忕▼搴忋�傛垜浠潪甯搁噸瑙嗘偍鐨勯殣绉侊紝鍥犳鍒跺畾浜嗕互涓嬮殣绉佹斂绛栵紝浠ユ槑纭鏄庢垜
+ 浠浣曟敹闆嗐�佷娇鐢ㄥ拰淇濇姢鎮ㄧ殑涓汉淇℃伅銆傝鎮ㄥ湪浣跨敤鎴戜滑鐨勫簲鐢ㄧ▼搴忓墠浠旂粏闃呰鍜岀悊瑙ｄ互涓�
+ 闅愮鏀跨瓥锛�
+ </view>
+ <view class="">
+ <h2 class="section">1.涓汉淇℃伅鐨勬敹闆嗗拰浣跨敤</h2>
+ <p class="section-detail">
+ 褰撴偍浣跨敤鎴戜滑鐨勫簲鐢ㄧ▼搴忔椂锛屾垜浠渶瑕佹敹闆嗘偍鐨勪竴浜涗釜浜轰俊鎭紝鍖呮嫭浣嗕笉闄愪簬浠ヤ笅鍐呭</p>
+ <ul class="section-detail">
+ <li style="color: rgb(84, 84, 84);font-weight: bold;">
+ 1.1 鐢ㄦ埛璐︽埛淇℃伅锛氱敤浜庣敤鎴锋敞鍐屻�佺櫥褰曞拰涓汉淇℃伅绠＄悊锛屽寘鎷敤鎴峰悕銆佸瘑鐮併�佸拰鐢佃瘽鍙风爜绛夈��</li>
+ <li>1.2 鐢ㄦ埛鐨勪釜浜轰俊鎭細鍖呮嫭浣嗕笉闄愪簬鐢ㄦ埛鐨�<text
+ style="color: rgb(84, 84, 84);font-weight: bold;">濮撳悕銆佸湴鍧�銆佸嚭鐢熸棩鏈熴�佹�у埆銆佽韩浠借瘉鍙风爜
+ </text>绛夛紝杩欎簺淇℃伅鍙互甯姪鎴戜滑鏇村ソ鍦版彁渚涘晢鍝佸拰鏈嶅姟</li>
+ <li>1.3 璁惧淇℃伅锛氭垜浠渶瑕佽闂偍鐨勮澶囦俊鎭紝鍖呮嫭璁惧鍨嬪彿銆佹搷浣滅郴缁熺増鏈�佸敮涓�璁惧
+ 鏍囪瘑绗︾瓑锛屼互渚挎垜浠洿濂藉湴涓烘偍鎻愪緵鏈嶅姟銆�</li>
+ <li>1.4 浣嶇疆淇℃伅锛氭垜浠渶瑕佽幏鍙栨偍鐨勪綅缃俊鎭紝浠ヤ究鎴戜滑鍙互鏇村ソ鍦颁负鎮ㄦ彁渚涙湇鍔�</li>
+ <li>1.5 缃戠粶淇℃伅锛氭垜浠渶瑕佹敹闆嗕竴浜涗笌鎮ㄧ殑浜掕仈缃戣繛鎺ユ湁鍏崇殑淇℃伅锛�<text
+ style="color: rgb(84, 84, 84);font-weight: bold;">鍖呮嫭浣嗕笉闄愪簬鎮ㄧ殑IP
+ 鍦板潃銆佹祻瑙堝櫒绫诲瀷銆両SP绛�</text></li>
+ <li>1.6 鐩告満鍜岀浉鍐屾潈闄愶細鎴戜滑闇�瑕佽闂偍鐨勭浉鏈哄拰鐩稿唽鏉冮檺锛屼互渚挎偍鍙互鎷嶇収銆佷笂浼犵収鐗�
+ 绛夛紝浠ヤ究鎴戜滑鏇村ソ鍦颁负鎮ㄦ彁渚涙湇鍔°��</li>
+ </ul>
+ </view>
+ <view class="">
+ <h2 class="section">2.涓汉淇℃伅鐨勪娇鐢ㄥ拰鍒嗕韩</h2>
+ <p class="section-detail">2.1 鎴戜滑鏀堕泦鎮ㄧ殑涓汉淇℃伅涓昏鏄负浜嗗悜鎮ㄦ彁渚涙洿濂界殑鏈嶅姟鍜屼紭鍖栨偍鐨勪娇鐢ㄤ綋楠屻�傛垜浠細涓ユ牸淇�
+ 鎶ゆ偍鐨勪釜浜轰俊鎭紝骞朵笉浼氬皢鎮ㄧ殑涓汉淇℃伅鍑哄敭缁欑涓夋柟銆傛垜浠彲鑳戒細灏嗘偍鐨勪釜浜轰俊鎭垎浜粰
+ 鎴戜滑鐨勫叧鑱斿叕鍙告垨鏈嶅姟鎻愪緵鍟嗭紝浠ヤ究涓烘偍鎻愪緵鏇村ソ鐨勬湇鍔°��
+ 闄ら潪娉曞緥娉曡鍙︽湁瑙勫畾锛屽惁鍒欐垜浠笉浼氬皢鎮ㄧ殑涓汉淇℃伅鐢ㄤ簬浠讳綍鍏朵粬鐢ㄩ�旓紝涔熶笉浼氬皢鎮ㄧ殑涓�
+ 浜轰俊鎭�忛湶缁欎换浣曠涓夋柟銆�</p>
+ </view>
+ <view class="">
+ <h2 class="section">3.涓汉淇℃伅鐨勫畨鍏ㄤ繚鎶�</h2>
+ <view class="section-detail">
+ <p>3.1 鎴戜滑浼氶噰鍙栦竴瀹氱殑瀹夊叏鎺柦鏉ヤ繚鎶ゆ偍鐨勪釜浜轰俊鎭笉琚湭缁忔巿鏉冪殑璁块棶銆佷娇鐢ㄦ垨娉勯湶銆傛垜浠皢
+ 浣跨敤鎶�鏈帾鏂藉拰绠＄悊鎺柦鏉ョ‘淇濇偍鐨勪釜浜轰俊鎭殑瀹夊叏鎬с��</p>
+ <p>3.2 鎴戜滑浼氶噰鍙栦互涓嬪畨鍏ㄦ帾鏂芥潵淇濇姢鎮ㄧ殑涓汉淇℃伅锛�</p>
+ <p>3.3 鎴戜滑浼氬鎮ㄧ殑涓汉淇℃伅杩涜鍔犲瘑澶勭悊锛屼互淇濋殰淇℃伅鐨勫畨鍏ㄦ��</p>
+ <p>3.4 鎴戜滑浼氬畾鏈熸鏌ユ垜浠殑绯荤粺锛屼互纭繚鎮ㄧ殑涓汉淇℃伅涓嶄細閬埌鏈粡鎺堟潈鐨勮闂�佷娇鐢ㄦ垨娉勯湶銆�</p>
+ <p>3.5 鎴戜滑浼氶檺鍒惰闂偍涓汉淇℃伅鐨勪汉鍛樿寖鍥达紝骞惰姹傝繖浜涗汉鍛橀伒瀹堜繚瀵嗕箟鍔�</p>
+ <p>鎴戜滑浼氶噰鐢ㄩ槻鐏銆佸弽鐥呮瘨杞欢鍜屽叾浠栧畨鍏ㄦ帾鏂斤紝浠ヤ繚鎶ゆ垜浠殑绯荤粺鍜屾偍鐨勪釜浜轰俊鎭笉鍙楀埌
+ 鎭舵剰鏀诲嚮鍜岀梾姣掓劅鏌撱��</p>
+ <p>3.6 灏界鎴戜滑宸茬粡閲囧彇浜嗙浉搴旂殑瀹夊叏鎺柦鏉ヤ繚鎶ゆ偍鐨勪釜浜轰俊鎭紝浣嗙敱浜庢妧鏈檺鍒跺拰椋庨櫓锛屾垜浠笉
+ 鑳戒繚璇佹偍鐨勪釜浜轰俊鎭笉浼氳鏈粡鎺堟潈鐨勮闂�佷娇鐢ㄦ垨娉勯湶銆傚湪鍙戠敓姝ょ被浜嬩欢鏃讹紝鎴戜滑灏嗛噰鍙�
+ 閫傚綋鐨勬帾鏂芥潵鍑忓皯鎹熷け銆�</p>
+ </view>
+ </view>
+ <view class="">
+ <h2 class="section">4.骞撮緞闄愬埗</h2>
+ <p class="section-detail">
+ 4.1 鎴戜滑鐨勫簲鐢ㄧ▼搴忓彧閫傜敤浜庡勾婊�18宀佺殑鐢ㄦ埛銆傚鏋滄偍鏈弧18宀侊紝璇蜂笉瑕佷娇鐢ㄦ垜浠殑搴旂敤绋嬪簭銆�
+ 濡傛灉鎴戜滑鍙戠幇鎮ㄦ槸鏈弧18宀佺殑鐢ㄦ埛锛屾垜浠皢绔嬪嵆鍒犻櫎鎮ㄧ殑涓汉淇℃伅銆�
+ </p>
+ </view>
+ <view class="">
+ <h2 class="section">5.闅愮鏀跨瓥鐨勪慨鏀�</h2>
+ <p class="section-detail">
+ 5.1 鎴戜滑鍙兘浼氭牴鎹渶瑕佹洿鏂版垨淇敼鏈殣绉佹斂绛栥�傚鏋滄垜浠鏈殣绉佹斂绛栬繘琛屼簡閲嶅ぇ鏇存敼锛屾垜浠�
+ 灏嗗湪搴旂敤绋嬪簭涓彂甯冮�氱煡鎴栦互鍏朵粬鏂瑰紡閫氱煡鎮ㄣ�傚湪鎴戜滑鍙戝竷淇敼閫氱煡鍚庯紝鎮ㄧ户缁娇鐢ㄦ垜浠殑
+ 搴旂敤绋嬪簭锛屽嵆琛ㄧず鎮ㄥ悓鎰忔帴鍙椾慨鏀瑰悗鐨勯殣绉佹斂绛�
+ </p>
+ </view>
+ <view class="">
+ <h2 class="section">6.鑱旂郴鎴戜滑</h2>
+ <p class="section-detail">
+ 6.1 濡傛灉鎮ㄥ鏈殣绉佹斂绛栨湁浠讳綍鐤戦棶鎴栨剰瑙侊紝璇烽�氳繃搴旂敤绋嬪簭鍐呯殑鑱旂郴鏂瑰紡涓庢垜浠仈绯汇�傛垜浠皢
+ 灏藉揩鍥炲鎮ㄥ苟瑙ｅ喅鎮ㄧ殑闂銆�
+ </p>
+ </view>
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style lang="scss"
+ scoped>
+ .main {
+ margin: 18rpx;
+ padding-bottom: 30rpx;
+ letter-spacing: 4rpx;
+
+ .title {
+ width: 100%;
+ text-align: center;
+ margin: 0 auto;
+ font-size: 56rpx;
+ font-weight: bold;
+ color: rgb(84, 84, 84);
+ }
+
+ .illustrate {
+ margin-bottom: 20rpx;
+ }
+
+ .section {
+ font-size: 40rpx;
+ color: rgb(84, 84, 84);
+ font-weight: bold;
+ }
+
+ .section-detail {
+ color: rgb(83, 83, 83);
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 5ef3909..c510333 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -57,6 +57,21 @@
@confirm="bindWxConfirm"
@cancel="bindWxCancel"></u-modal>
</view>
+ <!-- 娉ㄥ唽鍚屾剰鑾峰彇闅愮淇℃伅 -->
+ <view class="privacy">
+ <u-modal :show="privacyShow"
+ :title="privacyTitle"
+ showCancelButton
+ @confirm="privacyConfirm"
+ @cancel="privacyCancel"
+ confirmText="鍚屾剰"
+ cancelText="涓嶅悓鎰�">
+ <view class="slot-content"
+ @click="PrivacyAgreementHandle">
+ <rich-text :nodes="PrivacyAgreement"></rich-text>
+ </view>
+ </u-modal>
+ </view>
</view>
</template>
@@ -75,7 +90,10 @@
bindWxModelTitle: '鎻愮ず',
bindWxContent: '濡傛灉宸叉嫢鏈夌郴缁熻处鍙凤紝鍙互鐩存帴璺宠浆缁戝畾寰俊椤甸潰',
appid: "",
- secret: ""
+ secret: "",
+ privacyShow: false,
+ privacyTitle: "娉ㄦ剰",
+ PrivacyAgreement: `<p>娉ㄥ唽鍗充唬琛ㄦ偍鍚屾剰鎴戜滑鐢ㄦ埛闅愮鍗忚</p><p class='PrivacyAgreement'>鐐瑰嚮鏌ョ湅鐢ㄦ埛闅愮鍗忚</p>`
};
},
components: {
@@ -169,12 +187,23 @@
openPopup() {
console.log('鎵撳紑浜�');
},
- registerClick() {
+ privacyConfirm() {
uni.navigateTo({
url: '/pages/register/register'
});
},
- // 姝ゆ柟娉曞彧杩涜缁戝畾娴嬭瘯锛屽悗鏈熼�氳繃鎵爜瑙ｅ喅
+ privacyCancel() {
+ this.privacyShow = false
+ },
+ registerClick() {
+ this.privacyShow = true
+ },
+ PrivacyAgreementHandle() {
+ uni.navigateTo({
+ url: '/pages/login/PrivacyAgreementText/PrivacyAgreementText'
+ })
+ },
+ // 姝ゆ柟娉曞彧杩涜缁戝畾娴嬭瘯锛屽凡缁忛�氳繃鎵爜瑙ｅ喅
jumpBindBack() {
uni.navigateTo({
url: '/pages/bindBackground/bindBackground'
@@ -187,6 +216,10 @@
<style lang="scss">
@import 'index.scss';
+ .PrivacyAgreement {
+ color: rgb(60, 156, 255)
+ }
+
.login {
// height: 100vh;
// display: flex;
diff --git a/pages/register/register.vue b/pages/register/register.vue
index ffb99f4..6507980 100644
--- a/pages/register/register.vue
+++ b/pages/register/register.vue
@@ -120,8 +120,25 @@
width="250"
height="150"
:previewFullImage="true">
- <!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
- mode="widthFix" style="width: 250px;height: 150px;"></image> -->
+ </u-upload>
+ </u-form-item>
+ <u-form-item prop="bodyOfCarJpg"
+ label="杞﹁締缁嗚妭鐓х墖"
+ labelWidth="20%"
+ borderBottom
+ v-if="radiovalue1 == '鍙告満'"
+ required
+ @click="beforeRead">
+ <u-upload :fileList="fileList3"
+ deletable
+ @afterRead="afterRead"
+ @delete="deletePic"
+ name="3"
+ multiple
+ :maxCount="3"
+ width="250"
+ height="150"
+ :previewFullImage="true">
</u-upload>
</u-form-item>
<u-form-item prop="drivingImg"
@@ -141,8 +158,6 @@
width="250"
height="150"
:previewFullImage="true">
- <!-- <image src="https://cdn.uviewui.com/uview/demo/upload/positive.png"
- mode="widthFix" style="width: 250px;height: 150px;"></image> -->
</u-upload>
</u-form-item>
<u-form-item label="鎺ㄨ崘浜鸿处鍙�"
@@ -175,8 +190,7 @@
</template>
<script>
- import { apiRegister } from '@/api/publicInterface.js';
- import { BaseUrl } from '@/api/publicInterface.js';
+ import { apiRegister, BaseUrl } from '@/api/publicInterface.js';
import { mapMutations } from 'vuex';
export default {
// onLoad: function() {
@@ -197,14 +211,10 @@
// 鐩戝惉椤甸潰鍒濇娓叉煋瀹屾垚銆傛敞鎰忓鏋滄覆鏌撻�熷害蹇紝浼氬湪椤甸潰杩涘叆鍔ㄧ敾瀹屾垚鍓嶈Е鍙�
onReady() {
this.$refs.regesterFormRef.setRules(this.rules);
- // this.$refs.regesterFormRef.validate().then(res => {}).catch(err => {
- // console.log(err);
- // })
},
onLoad(params) {
if (params) {
this.registerFormModel.openId = params.code;
- console.log('椤甸潰鍔犺浇', this.registerFormModel.openId);
}
},
data() {
@@ -225,10 +235,13 @@
drivingImg: '',
tuiJianMa: '',
confirmPassword: '',
- vehicleColour: ''
+ vehicleColour: '',
+ bodyOfCarJpg: ''
},
fileList1: [],
fileList2: [],
+ fileList3: [],
+ carBody: [],
rules: {
name: {
type: 'string',
@@ -317,6 +330,12 @@
message: '璇蜂笂浼犺溅杈嗗浘鐗�',
trigger: ['blur', 'change']
},
+ bodyOfCarJpg: {
+ type: 'string',
+ required: true,
+ message: '璇蜂笂浼犺溅杈嗗浘鐗�',
+ trigger: ['blur', 'change']
+ },
drivingImg: {
type: 'string',
required: true,
@@ -340,10 +359,13 @@
},
{
name: '缁胯壊',
- disabled: 'lvse'
+ value: 'lvse'
+ },
+ {
+ name: '钃濊壊',
+ value: 'lanse'
}
],
- radiovalue2: '榛勮壊',
beforeChangeValue: '',
// 鏇存崲瑙掕壊寮规
editRoleModelShow: false,
@@ -483,6 +505,11 @@
} else if (num == 2) {
this.registerFormModel.drivingImg = JSON.parse(res.data).data.url;
resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
+ } else if (num == 3) {
+ let imageUrl = JSON.parse(res.data).data.url
+ this.carBody.push(imageUrl)
+ this.registerFormModel.bodyOfCarJpg = this.carBody.join(',')
+ resolve(`${BaseUrl}${JSON.parse(res.data).data.url}`);
}
}
});
diff --git a/pages/tabbar-page/index-tabbar/index-tabbar.vue b/pages/tabbar-page/index-tabbar/index-tabbar.vue
index 895a958..330e9d4 100644
--- a/pages/tabbar-page/index-tabbar/index-tabbar.vue
+++ b/pages/tabbar-page/index-tabbar/index-tabbar.vue
@@ -155,6 +155,7 @@
} else {
this.changeinfraredStatus(false);
this.changeWeigh(nowWeighObj.weigh);
+ let warningState = nowWeighObj.warning == 1
this.changeWarning(warningState)
}
}
--
Gitblit v1.9.1