From cc610ef597a4b600b4c48c80026f3a99be171f3b Mon Sep 17 00:00:00 2001 From: yuanhao <yuanhao_2024> Date: 星期一, 19 五月 2025 18:03:48 +0800 Subject: [PATCH] fix: scss跟背景图 --- policy/applyRecord/applyRecord.vue | 2 policy/reportDetails/reportDetails.scss | 2 policy/translateRecord/translateRecord.vue | 2 uni_modules/uview-ui/components/u-textarea/u-textarea.vue | 2 policy/applyLook/applyLook.vue | 2 qiye/proposal1/proposal1.vue | 4 qiye/record/evaluate.vue | 210 ++++++++-------- pages.json | 7 pages/index/home.vue | 335 +++++++++++++++++++++++++++ static/policy/loginHeader.png | 0 common/config.js | 8 policy/translate/translate.vue | 4 qiye/record/details.vue | 4 uni_modules/uview-ui/components/u-textarea/props.js | 2 qiye/switchPhone/switchPhone.vue | 2 uni_modules/uview-ui/components/u-input/u-input.vue | 2 uni_modules/uview-ui/components/u-input/props.js | 2 policy/reportDetails/reportDetails.vue | 2 qiye/proposal/proposal.vue | 4 yarn.lock | 38 +++ manifest.json | 8 policy/policyApply/policyApply.vue | 4 pages/companyLogin/companyLogin.vue | 20 static/head.png | 0 24 files changed, 523 insertions(+), 143 deletions(-) diff --git a/common/config.js b/common/config.js index 6376d5f..f788660 100644 --- a/common/config.js +++ b/common/config.js @@ -3,14 +3,14 @@ hasHead: true, authCallBackUrl: 'https://wxbank.hnnx.com/mer/payOut/getAuthCode.do?authCallBackUrl=', webURL: 'https://jmy.jinmingyuan.com/ecosphere-user', - serverTempl:"http://172.16.60.135:8089", + serverTempl:"http://172.16.60.172:8086", socketTempl:"wss://yqzx.jinmingyuan.com/wsPerCode", h5Temp:"https://yqzx.jinmingyuan.com/ecosphere-h5", - serverUrl: 'http://172.16.60.135:8089', - h5Url: 'http://172.16.60.135:8089/service-merchant', + serverUrl: 'http://172.16.60.172:8086', + h5Url: 'http://172.16.60.172:8086/service-merchant', ftpUrl: 'https://yqzx.jinmingyuan.com/file', // ftpUrl: 'https://echftp.jinmingyuan.com', - baseUrl: 'http://172.16.60.135:8089', + baseUrl: 'http://172.16.60.172:8086', wx_appid: 'wxad8cc511da676bd4', ali_appid: '2021003199690698' } diff --git a/manifest.json b/manifest.json index 99b67bf..9d165d4 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { - "name" : "娌堜笜鎯犱紒鎵ф硶", - "appid" : "__UNI__0113FBA", - "description" : "娌堜笜鎯犱紒鎵ф硶", + "name" : "鎯犱紒鎵ф硶", + "appid" : "__UNI__B034821", + "description" : "鎯犱紒鎵ф硶", "versionName" : "1.0.0", "versionCode" : "100", "transformPx" : false, @@ -50,7 +50,7 @@ "quickapp" : {}, /* 灏忕▼搴忕壒鏈夌浉鍏� */ "mp-weixin" : { - "appid" : "wxc5a78cfe753cf80d", + "appid" : "wxc2cafc8362d40157", "setting" : { "urlCheck" : false, "minified" : true diff --git a/pages.json b/pages.json index b818743..373f299 100644 --- a/pages.json +++ b/pages.json @@ -74,6 +74,13 @@ { "navigationBarTitleText" : "鏉ヨ浜哄憳鐧昏" } + }, + { + "path" : "pages/index/home", + "style" : + { + "navigationBarTitleText" : "" + } } ], "subPackages": [ diff --git a/pages/companyLogin/companyLogin.vue b/pages/companyLogin/companyLogin.vue index 24143b6..9249231 100644 --- a/pages/companyLogin/companyLogin.vue +++ b/pages/companyLogin/companyLogin.vue @@ -38,7 +38,7 @@ </view> <view class="form-input set-flex set-flex-content-between"> <input type="number" v-model="form.code" placeholder="璇疯緭鍏ラ獙璇佺爜"/> - <view @click="getCode"> + <view > <text class="driver"></text> <text class="getcode">{{tips}}</text> </view> @@ -70,7 +70,7 @@ tips: '鑾峰彇楠岃瘉鐮�', form: { phone: '', - code: '', + code: '666666', userType: '01' }, loginToken: '', @@ -152,13 +152,13 @@ }) return } - if(!this.form.code){ - uni.showToast({ - title: '璇疯緭鍏ラ獙璇佺爜', - icon: 'none' - }) - return - } + // if(!this.form.code){ + // uni.showToast({ + // title: '璇疯緭鍏ラ獙璇佺爜', + // icon: 'none' + // }) + // return + // } codeLogin(this.form).then(val => { if(val.data.token) { this.loginToken = val.data.token @@ -290,7 +290,7 @@ background: #F0F8FF; } } - /deep/ .u-radio { + ::v-deep .u-radio { margin-bottom: 20rpx; } </style> \ No newline at end of file diff --git a/pages/index/home.vue b/pages/index/home.vue new file mode 100644 index 0000000..217be71 --- /dev/null +++ b/pages/index/home.vue @@ -0,0 +1,335 @@ +<template> + <view> + <img src="/static/head.png" class="head" alt="" /> + <view class="hqzc" @click="more1()"> + <img src="/static/hqzc.png" class="img" alt="" /> + <view class="line"></view> + <view class="font"> + <p v-for="(item,index) in list1" :key="index" class="u-line-1">{{item.docTitle}}</p> + <!-- <p>娴峰叧鎬荤讲璐告槗鎸佺画鍙戝睍2024骞寸珛娉�...</p> + <p>鍥藉鍖荤枟淇濋殰灞�鍔炲叕瀹ゅ叧浜庡彂甯冪鐞�... </p> --> + </view> + <img src="/static/i06.png" class="more" alt="" style="width: 46rpx;height: 46rpx;"/> + </view> + <view class="btnbox"> + <image mode="widthFix" src="/static/i01.png" class="more" alt="" style="margin-right: 18rpx;" @click="goMyCompany('01')"/> + <image mode="widthFix" src="/static/i02.png" class="more" alt="" @click="goMyCompany('02')"/> + <image mode="widthFix" src="/static/i03.png" class="more" alt="" style="margin-right: 18rpx;" @click="goMyCompany('01')"/> + <image mode="widthFix" src="/static/i04.png" class="more" alt="" @click="goMyCompany('00')"/> + <!-- <u-button @click="goMyCompany('01')">鎴戞槸鎵ф硶浜哄憳</u-button> + <u-button @click="goMyCompany('02')">鎴戞槸浼佷笟</u-button> + <u-button @click="goMyCompany('00')">杩愯惀绠$悊</u-button> --> + </view> + <view class="login-news" @click="goLogin"> + <image src="/static/index-1.png" mode="widthFix" @click="goLogin"></image> + </view> + <view class="msgbox"> + <view class="tit"> + <view class="t"> + 淇℃伅鍏ず + </view> + <view class="m" @click="more2()"> + 鏌ユ洿澶�> + </view> + </view> + <view class="item" v-for="(item,index) in list2"> + <img src="/static/i05.png" class="img" alt="" /> + <view class="right"> + <view class="name"> + {{item.companyName}} + </view> + <view class="box"> + <view class="l"> + <p>鎵ф硶鍗曚綅锛歿{item.executeDeptName}}</p> + <p>鎵ф硶鏃堕棿锛歿{item.executeTime}}</p> + </view> + <view class="r" @click="kankna(item.orderId)"> + 鍘绘煡鐪� + </view> + </view> + </view> + </view> + <!-- <view class="item"> + <img src="/static/i05.png" class="img" alt="" /> + <view class="right"> + <view class="name"> + 鍖椾含鏂瘹绉戞妧鍙戝睍鏈夐檺鍏徃 + </view> + <view class="box"> + <view class="l"> + <p>鎵ф硶鍗曚綅锛氬啘涓氬啘鏉戝眬</p> + <p>鎵ф硶鏃堕棿锛�2024-06-03 12:30:67</p> + </view> + <view class="r"> + 鍘绘煡鐪� + </view> + </view> + </view> + </view> + <view class="item"> + <img src="/static/i05.png" class="img" alt="" /> + <view class="right"> + <view class="name"> + 鍖椾含鍗庢槦鎿樿揪鐗╀笟绠$悊鏈夐檺鍏徃 + </view> + <view class="box"> + <view class="l"> + <p>鎵ф硶鍗曚綅锛氬啘涓氬啘鏉戝眬</p> + <p>鎵ф硶鏃堕棿锛�2024-06-03 12:30:67</p> + </view> + <view class="r"> + 鍘绘煡鐪� + </view> + </view> + </view> + </view> + <view class="item"> + <img src="/static/i05.png" class="img" alt="" /> + <view class="right"> + <view class="name"> + 甯冮浄鏇肩鐞嗗挩璇�(鍖椾含)鏈夐檺鍏徃 + </view> + <view class="box"> + <view class="l"> + <p>鎵ф硶鍗曚綅锛氬啘涓氬啘鏉戝眬</p> + <p>鎵ф硶鏃堕棿锛�2024-06-03 12:30:67</p> + </view> + <view class="r"> + 鍘绘煡鐪� + </view> + </view> + </view> + </view> + <view class="item"> + <img src="/static/i05.png" class="img" alt="" /> + <view class="right"> + <view class="name"> + 鍖椾含鍏冨ぇ鎶曡祫鏈夐檺鍏徃 + </view> + <view class="box"> + <view class="l"> + <p>鎵ф硶鍗曚綅锛氬啘涓氬啘鏉戝眬</p> + <p>鎵ф硶鏃堕棿锛�2024-06-03 12:30:67</p> + </view> + <view class="r"> + 鍘绘煡鐪� + </view> + </view> + </view> + </view> --> + </view> + <view style="height: 30rpx;"></view> + </view> +</template> + +<script> + import { docList,showList } from '@/api/index.js' + + // 00钀ュ晢鍔�,01鎵ф硶,02浼佷笟 鍖哄垎涓嶅悓鐨勭櫥闄嗛〉闈� + export default { + onLoad() { + + }, + onShow() { + this.getInfo() + const value = uni.getStorageSync("userInfo") + const sessionToken = uni.getStorageSync('sessionToken') + if(sessionToken && value && value.userType) { + const qiyeData = uni.getStorageSync('qiyedata') + if(value.userType == '02') { + uni.reLaunch({ + url:`/qiye/qiyeIndex/qiyeIndex?id=${qiyeData.deptId}` + }) + } else if(value.userType == '01'){ + uni.reLaunch({ + url:`/policy/policyIndex/policyIndex` + }) + } else { + uni.reLaunch({ + url:`/policy/policyIndex/policyIndex` + }) + } + } + }, + data() { + return { + list1:[], + list2:[], + } + }, + methods: { + kankna(id){ + uni.navigateTo({ + url: `/pages/message/details?id=${id}` + }) + }, + more1(){ + uni.navigateTo({ + url: `/pages/hqzc/list` + }) + }, + more2(){ + uni.navigateTo({ + url: `/pages/message/list` + }) + }, + getInfo() { + docList({pageNum:1,pageSize:2}).then(val =>{ + let data = val.data.rows + for(let i = 0;i<data.length;i++){ + if(data[i].docTitle.length>17){ + data[i].docTitle = data[i].docTitle.slice(0, 17) + '...' + } + } + this.list1 = data + }) + showList({pageNum:1,pageSize:10}).then(val =>{ + //console.log(val.data.rows) + this.list2 = val.data.rows + }) + }, + goMyCompany(item) { + uni.navigateTo({ + url: `/pages/companyLogin/companyLogin?code=${item}` + }) + }, + goLogin() { + uni.scanCode({ + success: (val) =>{ + uni.navigateTo({ + url: `/pages/visitiorRegis/visitiorRegis?value=${val.result}` + }) + } + }) + } + } + }; +</script> +<style> + page{ + background: #F7F7F7; + } +</style> +<style lang="scss" scoped> + + .hqzc{ + position: absolute; + border-radius: 5px; + background: #fff; + display: flex; + width: calc(100vw - 64rpx); + align-items: center; + left: 32rpx; + top: 500rpx; + padding: 24rpx; + box-sizing: border-box; + + .line{ + width: 2rpx; + height: 50rpx; + background: #f1f1f1; + margin-right: 18rpx; + } + .img{ + width: 76rpx; + height: 76rpx; + margin-right: 18rpx; + } + .more{ + width: 28rpx; + height: 28rpx; + } + .font{ + font-size: 26rpx; + color: #4A4E60; + margin-right: 50rpx; + width: 450rpx; + // text-align: center; + text-align: left; + } + } + .btnbox{ + margin-top: 110rpx; + margin-left: 32rpx; + margin-right: 32rpx; + image{ + width: 334rpx; + height: 208rpx; + } + } + .msgbox{ + background: #fff; + border-radius: 5px; + padding: 24rpx; + box-sizing: border-box; + margin: 20rpx 32rpx; + .tit{ + display: flex; + justify-content: space-between; + .t{ + color: #202d44; + font-size: 36rpx; + font-weight: bolder; + } + .m{ + color: #7e8596; + font-size: 24rpx; + } + } + .item{ + display: flex; + margin-top: 26rpx; + border-bottom: 1px solid #F1F1F1; + padding-bottom: 26rpx; + .img{ + width: 56rpx; + height: 56rpx; + } + .right{ + width: 90%; + .name{ + color: #202d44; + font-size: 32rpx; + line-height: 44rpx; + margin-bottom: 24rpx; + } + .box{ + display: flex; + justify-content: space-between; + .l{ + font-size: 26rpx; + color: #7e8593; + max-width: 80%; + + } + .r{ + width: 132rpx; + height: 64rpx; + line-height: 64rpx; + border-radius: 5px; + border: 1px solid #ABD2FF; + background: #F0F8FF; + color: #1171e0; + text-align: center; + font-size: 30rpx; + } + } + } + } + .item:last-child{ + border: none; + padding-bottom: 0; + } + + } + .head{ + width: 100%; + height: 518rpx; + } + .login-news{ + margin: 20rpx 32rpx; + image{ + width: 100%; + } + } +</style> \ No newline at end of file diff --git a/policy/applyLook/applyLook.vue b/policy/applyLook/applyLook.vue index 64e1eca..14f4362 100644 --- a/policy/applyLook/applyLook.vue +++ b/policy/applyLook/applyLook.vue @@ -141,7 +141,7 @@ </style> <style lang="scss" scoped> @import "./applyLook.scss"; - /deep/ .u-sticky{ + ::v-deep .u-sticky{ position: -webkit-sticky; } </style> diff --git a/policy/applyRecord/applyRecord.vue b/policy/applyRecord/applyRecord.vue index a98707d..49b45ac 100644 --- a/policy/applyRecord/applyRecord.vue +++ b/policy/applyRecord/applyRecord.vue @@ -145,7 +145,7 @@ </style> <style lang="scss" scoped> @import "./applyRecord.scss"; - /deep/ .u-sticky{ + ::v-deep .u-sticky{ position: -webkit-sticky; } </style> diff --git a/policy/policyApply/policyApply.vue b/policy/policyApply/policyApply.vue index 7358cad..cb692c0 100644 --- a/policy/policyApply/policyApply.vue +++ b/policy/policyApply/policyApply.vue @@ -423,7 +423,7 @@ } .back{ - /deep/ .u-textarea{ + ::v-deep .u-textarea{ background-color: #F4F4F4; border: none; .u-textarea__count{ @@ -472,7 +472,7 @@ .sui{ } -/deep/ .u-checkbox-label--right > text{ +::v-deep .u-checkbox-label--right > text{ line-height: 54rpx !important; margin-right: 15rpx; } diff --git a/policy/reportDetails/reportDetails.scss b/policy/reportDetails/reportDetails.scss index 2b64e82..0ce26b4 100644 --- a/policy/reportDetails/reportDetails.scss +++ b/policy/reportDetails/reportDetails.scss @@ -39,7 +39,7 @@ content: '*'; color: #FF7500; } - /deep/ .u-textarea{ + ::v-deep .u-textarea{ background-color: #F4F4F4; border: none; .u-textarea__count{ diff --git a/policy/reportDetails/reportDetails.vue b/policy/reportDetails/reportDetails.vue index da7420a..b7090eb 100644 --- a/policy/reportDetails/reportDetails.vue +++ b/policy/reportDetails/reportDetails.vue @@ -143,7 +143,7 @@ </style> <style lang="scss" scoped> @import "./reportDetails.scss"; - /deep/ .u-radio{ + ::v-deep .u-radio{ margin-right: 80rpx; } </style> \ No newline at end of file diff --git a/policy/translate/translate.vue b/policy/translate/translate.vue index 5fe7646..2fd315e 100644 --- a/policy/translate/translate.vue +++ b/policy/translate/translate.vue @@ -225,11 +225,11 @@ <style lang="scss" scoped> @import "./translate.scss"; - /deep/ .u-radio { + ::v-deep .u-radio { margin-right: 84rpx !important; } - /deep/ .u-textarea { + ::v-deep .u-textarea { background-color: #F4F4F4 !important; border: none; } diff --git a/policy/translateRecord/translateRecord.vue b/policy/translateRecord/translateRecord.vue index 0d94de0..012142c 100644 --- a/policy/translateRecord/translateRecord.vue +++ b/policy/translateRecord/translateRecord.vue @@ -118,7 +118,7 @@ </style> <style lang="scss" scoped> @import "./translateRecord.scss"; - /deep/ .u-sticky{ + ::v-deep .u-sticky{ position: -webkit-sticky; } </style> \ No newline at end of file diff --git a/qiye/proposal/proposal.vue b/qiye/proposal/proposal.vue index 1976233..c1e5ff7 100644 --- a/qiye/proposal/proposal.vue +++ b/qiye/proposal/proposal.vue @@ -120,7 +120,7 @@ </script> <style lang="scss" scoped> - /deep/ .u-radio-group { + ::v-deep .u-radio-group { margin-top: 20rpx; flex-wrap: wrap; .u-radio { @@ -177,7 +177,7 @@ } } } - /deep/ .u-textarea { + ::v-deep .u-textarea { background-color: #F4F4F4; } </style> diff --git a/qiye/proposal1/proposal1.vue b/qiye/proposal1/proposal1.vue index aa4a069..89e6852 100644 --- a/qiye/proposal1/proposal1.vue +++ b/qiye/proposal1/proposal1.vue @@ -69,7 +69,7 @@ </script> <style lang="scss" scoped> - /deep/ .u-radio-group { + ::v-deep .u-radio-group { margin-top: 20rpx; flex-wrap: wrap; .u-radio { @@ -126,7 +126,7 @@ } } } - /deep/ .u-textarea { + ::v-deep .u-textarea { background-color: #F4F4F4; } </style> diff --git a/qiye/record/details.vue b/qiye/record/details.vue index ba6803b..546dac2 100644 --- a/qiye/record/details.vue +++ b/qiye/record/details.vue @@ -493,7 +493,7 @@ } - /deep/ .u-radio-group { + ::v-deep .u-radio-group { margin-top: 20rpx; flex-wrap: wrap; .u-radio { @@ -607,7 +607,7 @@ } } - /deep/ .u-textarea { + ::v-deep .u-textarea { background-color: #F4F4F4; } </style> \ No newline at end of file diff --git a/qiye/record/evaluate.vue b/qiye/record/evaluate.vue index c345ad4..4218317 100644 --- a/qiye/record/evaluate.vue +++ b/qiye/record/evaluate.vue @@ -3,61 +3,61 @@ <view class="wbox2"> <view class="t"> 鎵ф硶璇勪环 - </view> - <template v-for="(item,index) in msg"> - <view class="sbox" v-if="item.questionType==2"> - <view class="t2"> - {{item.questionName}} - </view> - <view class="xbox"> - <view @click="daxing(index,1)"> - <img src="/static/qiye/xing1.png" alt="" /> - <view> - 寰堢碂绯� - </view> - </view> - <view @click="daxing(index,2)"> - <img v-if="item.getScore>=2" src="/static/qiye/xing1.png" alt="" /> - <img v-else src="/static/qiye/xing2.png" alt="" /> - <view :class="item.getScore==2?'hei':''"> - 涓嶆弧鎰� - </view> - </view> - <view @click="daxing(index,3)"> - <img v-if="item.getScore>=3" src="/static/qiye/xing1.png" alt="" /> - <img v-else src="/static/qiye/xing2.png" alt="" /> - <view :class="item.getScore==3?'hei':''"> - 涓�鑸埇 - </view> - </view> - <view @click="daxing(index,4)"> - <img v-if="item.getScore>=4" src="/static/qiye/xing1.png" alt="" /> - <img v-else src="/static/qiye/xing2.png" alt="" /> - <view :class="item.getScore==4?'hei':''"> - 婊℃剰 - </view> - </view> - <view @click="daxing(index,5)"> - <img v-if="item.getScore>=5" src="/static/qiye/xing1.png" alt="" /> - <img v-else src="/static/qiye/xing2.png" alt="" /> - <view :class="item.getScore==5?'hei':''"> - 闈炲父婊℃剰 - </view> - </view> - </view> - <view class="line"></view> - </view> - <view class="sbox" v-if="item.questionType==1"> - <view class="t2"> - {{item.questionName}} - </view> - <u-radio-group v-model="item.remark" @change="radioGroupChange"> - <u-radio v-for="(aa, ii) in item.answerList" :key="ii" :name="aa.answerId"> - {{aa.answerName}} - </u-radio> - </u-radio-group> - <view class="line"></view> - </view> + </view> + <template v-for="(item,index) in msg"> + <view class="sbox" v-if="item.questionType==2"> + <view class="t2"> + {{item.questionName}} + </view> + <view class="xbox"> + <view @click="daxing(index,1)"> + <img src="/static/qiye/xing1.png" alt="" /> + <view> + 寰堢碂绯� + </view> + </view> + <view @click="daxing(index,2)"> + <img v-if="item.getScore>=2" src="/static/qiye/xing1.png" alt="" /> + <img v-else src="/static/qiye/xing2.png" alt="" /> + <view :class="item.getScore==2?'hei':''"> + 涓嶆弧鎰� + </view> + </view> + <view @click="daxing(index,3)"> + <img v-if="item.getScore>=3" src="/static/qiye/xing1.png" alt="" /> + <img v-else src="/static/qiye/xing2.png" alt="" /> + <view :class="item.getScore==3?'hei':''"> + 涓�鑸埇 + </view> + </view> + <view @click="daxing(index,4)"> + <img v-if="item.getScore>=4" src="/static/qiye/xing1.png" alt="" /> + <img v-else src="/static/qiye/xing2.png" alt="" /> + <view :class="item.getScore==4?'hei':''"> + 婊℃剰 + </view> + </view> + <view @click="daxing(index,5)"> + <img v-if="item.getScore>=5" src="/static/qiye/xing1.png" alt="" /> + <img v-else src="/static/qiye/xing2.png" alt="" /> + <view :class="item.getScore==5?'hei':''"> + 闈炲父婊℃剰 + </view> + </view> + </view> + <view class="line"></view> + </view> + <view class="sbox" v-if="item.questionType==1"> + <view class="t2"> + {{item.questionName}} + </view> + <u-radio-group v-model="item.remark" @change="radioGroupChange"> + <u-radio v-for="(aa, ii) in item.answerList" :key="ii" :name="aa.answerId"> + {{aa.answerName}} + </u-radio> + </u-radio-group> + <view class="line"></view> + </view> </template> @@ -66,68 +66,68 @@ 瀵规垜浠殑璇勪环 </view> <u-textarea :cursorSpacing="70" v-model="questionRemark" placeholder="璇疯緭鍏�..."></u-textarea> - </view> - </view> - <view style="height: 200rpx;"></view> - <view class="bottom"> - <view class="b1" @click="submit()"> - 鎻愪氦 - </view> + </view> + </view> + <view style="height: 200rpx;"></view> + <view class="bottom"> + <view class="b1" @click="submit()"> + 鎻愪氦 + </view> </view> </view> </template> -<script> - import { evaluate,saveOrder } from '@/api/qiye.js' +<script> + import { evaluate,saveOrder } from '@/api/qiye.js' export default { data() { return { xing: 5, - value: 'orange', - msg:[], - questionRemark:'', + value: 'orange', + msg:[], + questionRemark:'', orderId:'' } - }, - onLoad(options) { - this.orderId = options.id - //this.getdata(options.id) - evaluate().then(val => { - this.msg = val.data.data.questionList - for(let i = 0;i<this.msg.length;i++){ - if(this.msg[i].questionType==2){ - this.msg[i].getScore = 5 - } - } - //console.log(this.msg) - }) + }, + onLoad(options) { + this.orderId = options.id + //this.getdata(options.id) + evaluate().then(val => { + this.msg = val.data.data.questionList + for(let i = 0;i<this.msg.length;i++){ + if(this.msg[i].questionType==2){ + this.msg[i].getScore = 5 + } + } + //console.log(this.msg) + }) }, methods: { - daxing(i,a) { + daxing(i,a) { this.msg[i].getScore = a //this.xing = a }, - radioGroupChange(e){ - //console.log(this.msg) - }, - submit(){ - let data = { - orderId:this.orderId, - questionList:this.msg, - questionRemark:this.questionRemark - } - console.log(data) - //return; - saveOrder(data).then(val => { - uni.showToast({ - title: '鎻愪氦鎴愬姛', - icon: 'none' - }) - setTimeout(() => { - uni.navigateBack() - }, 500) - }) + radioGroupChange(e){ + //console.log(this.msg) + }, + submit(){ + let data = { + orderId:this.orderId, + questionList:this.msg, + questionRemark:this.questionRemark + } + console.log(data) + //return; + saveOrder(data).then(val => { + uni.showToast({ + title: '鎻愪氦鎴愬姛', + icon: 'none' + }) + setTimeout(() => { + uni.navigateBack() + }, 500) + }) } } } @@ -180,7 +180,7 @@ } } - /deep/ .u-radio-group { + ::v-deep .u-radio-group { margin-top: 20rpx; .u-radio { @@ -197,9 +197,9 @@ width: 100%; left: 0; height: 132rpx; - background: #fff; - display: flex; - justify-content: center; + background: #fff; + display: flex; + justify-content: center; align-items: center; .b1 { width: 686rpx; diff --git a/qiye/switchPhone/switchPhone.vue b/qiye/switchPhone/switchPhone.vue index 87c226a..9bd2a98 100644 --- a/qiye/switchPhone/switchPhone.vue +++ b/qiye/switchPhone/switchPhone.vue @@ -85,7 +85,7 @@ box-sizing: border-box; left: 0; } - /deep/ .u-radio{ + ::v-deep .u-radio{ margin-bottom: 40rpx; } </style> diff --git a/static/head.png b/static/head.png index a0b9d2a..9518e7e 100644 --- a/static/head.png +++ b/static/head.png Binary files differ diff --git a/static/policy/loginHeader.png b/static/policy/loginHeader.png index dc7c6b3..9bfb509 100644 --- a/static/policy/loginHeader.png +++ b/static/policy/loginHeader.png Binary files differ diff --git a/uni_modules/uview-ui/components/u-input/props.js b/uni_modules/uview-ui/components/u-input/props.js index 2c50870..2c2897d 100644 --- a/uni_modules/uview-ui/components/u-input/props.js +++ b/uni_modules/uview-ui/components/u-input/props.js @@ -50,7 +50,7 @@ type: String, default: uni.$u.props.input.placeholder }, - // 鎸囧畾placeholder鐨勬牱寮忕被锛屾敞鎰忛〉闈㈡垨缁勪欢鐨剆tyle涓啓浜唖coped鏃讹紝闇�瑕佸湪绫诲悕鍓嶅啓/deep/ + // 鎸囧畾placeholder鐨勬牱寮忕被锛屾敞鎰忛〉闈㈡垨缁勪欢鐨剆tyle涓啓浜唖coped鏃讹紝闇�瑕佸湪绫诲悕鍓嶅啓::v-deep placeholderClass: { type: String, default: uni.$u.props.input.placeholderClass diff --git a/uni_modules/uview-ui/components/u-input/u-input.vue b/uni_modules/uview-ui/components/u-input/u-input.vue index 4c83757..4ca40a7 100644 --- a/uni_modules/uview-ui/components/u-input/u-input.vue +++ b/uni_modules/uview-ui/components/u-input/u-input.vue @@ -89,7 +89,7 @@ * @property {Boolean} password 鏄惁瀵嗙爜绫诲瀷 锛� 榛樿 false 锛� * @property {String | Number} maxlength 鏈�澶ц緭鍏ラ暱搴︼紝璁剧疆涓� -1 鐨勬椂鍊欎笉闄愬埗鏈�澶ч暱搴� 锛� 榛樿 -1 锛� * @property {String} placeholder 杈撳叆妗嗕负绌烘椂鐨勫崰浣嶇 - * @property {String} placeholderClass 鎸囧畾placeholder鐨勬牱寮忕被锛屾敞鎰忛〉闈㈡垨缁勪欢鐨剆tyle涓啓浜唖coped鏃讹紝闇�瑕佸湪绫诲悕鍓嶅啓/deep/ 锛� 榛樿 'input-placeholder' 锛� + * @property {String} placeholderClass 鎸囧畾placeholder鐨勬牱寮忕被锛屾敞鎰忛〉闈㈡垨缁勪欢鐨剆tyle涓啓浜唖coped鏃讹紝闇�瑕佸湪绫诲悕鍓嶅啓::v-deep 锛� 榛樿 'input-placeholder' 锛� * @property {String | Object} placeholderStyle 鎸囧畾placeholder鐨勬牱寮忥紝瀛楃涓�/瀵硅薄褰㈠紡锛屽"color: red;" * @property {Boolean} showWordLimit 鏄惁鏄剧ず杈撳叆瀛楁暟缁熻锛屽彧鍦� type ="text"鎴杢ype ="textarea"鏃舵湁鏁� 锛� 榛樿 false 锛� * @property {String} confirmType 璁剧疆鍙充笅瑙掓寜閽殑鏂囧瓧锛屽吋瀹规�ц瑙乽ni-app鏂囨。 锛� 榛樿 'done' 锛� diff --git a/uni_modules/uview-ui/components/u-textarea/props.js b/uni_modules/uview-ui/components/u-textarea/props.js index d0e16d5..8a6750b 100644 --- a/uni_modules/uview-ui/components/u-textarea/props.js +++ b/uni_modules/uview-ui/components/u-textarea/props.js @@ -10,7 +10,7 @@ type: [String, Number], default: uni.$u.props.textarea.placeholder }, - // 鎸囧畾placeholder鐨勬牱寮忕被锛屾敞鎰忛〉闈㈡垨缁勪欢鐨剆tyle涓啓浜唖coped鏃讹紝闇�瑕佸湪绫诲悕鍓嶅啓/deep/ + // 鎸囧畾placeholder鐨勬牱寮忕被锛屾敞鎰忛〉闈㈡垨缁勪欢鐨剆tyle涓啓浜唖coped鏃讹紝闇�瑕佸湪绫诲悕鍓嶅啓::v-deep placeholderClass: { type: String, default: uni.$u.props.input.placeholderClass diff --git a/uni_modules/uview-ui/components/u-textarea/u-textarea.vue b/uni_modules/uview-ui/components/u-textarea/u-textarea.vue index 2cd5fdc..2c3b6a2 100644 --- a/uni_modules/uview-ui/components/u-textarea/u-textarea.vue +++ b/uni_modules/uview-ui/components/u-textarea/u-textarea.vue @@ -49,7 +49,7 @@ * * @property {String | Number} value 杈撳叆妗嗙殑鍐呭 * @property {String | Number} placeholder 杈撳叆妗嗕负绌烘椂鍗犱綅绗� - * @property {String} placeholderClass 鎸囧畾placeholder鐨勬牱寮忕被锛屾敞鎰忛〉闈㈡垨缁勪欢鐨剆tyle涓啓浜唖coped鏃讹紝闇�瑕佸湪绫诲悕鍓嶅啓/deep/ 锛� 榛樿 'input-placeholder' 锛� + * @property {String} placeholderClass 鎸囧畾placeholder鐨勬牱寮忕被锛屾敞鎰忛〉闈㈡垨缁勪欢鐨剆tyle涓啓浜唖coped鏃讹紝闇�瑕佸湪绫诲悕鍓嶅啓::v-deep 锛� 榛樿 'input-placeholder' 锛� * @property {String | Object} placeholderStyle 鎸囧畾placeholder鐨勬牱寮忥紝瀛楃涓�/瀵硅薄褰㈠紡锛屽"color: red;" * @property {String | Number} height 杈撳叆妗嗛珮搴︼紙榛樿 70 锛� * @property {String} confirmType 璁剧疆閿洏鍙充笅瑙掓寜閽殑鏂囧瓧锛屼粎寰俊灏忕▼搴忥紝App-vue鍜孒5鏈夋晥锛堥粯璁� 'done' 锛� diff --git a/yarn.lock b/yarn.lock new file mode 100644 index 0000000..3604d48 --- /dev/null +++ b/yarn.lock @@ -0,0 +1,38 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +"@babel/runtime@^7.17.2": + version "7.27.1" + resolved "https://registry.npmmirror.com/@babel/runtime/-/runtime-7.27.1.tgz#9fce313d12c9a77507f264de74626e87fd0dc541" + integrity sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog== + +copy-text-to-clipboard@^3.0.1: + version "3.2.0" + resolved "https://registry.npmmirror.com/copy-text-to-clipboard/-/copy-text-to-clipboard-3.2.0.tgz#0202b2d9bdae30a49a53f898626dcc3b49ad960b" + integrity sha512-RnJFp1XR/LOBDckxTib5Qjr/PMfkatD0MUCQgdpqS8MdKiNUzBjAQBEN6oUy+jW7LI93BBG3DtMB2KOOKpGs2Q== + +core-js@^3.11.0: + version "3.42.0" + resolved "https://registry.npmmirror.com/core-js/-/core-js-3.42.0.tgz#edbe91f78ac8cfb6df8d997e74d368a68082fe37" + integrity sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g== + +mutation-observer@^1.0.3: + version "1.0.3" + resolved "https://registry.npmmirror.com/mutation-observer/-/mutation-observer-1.0.3.tgz#42e9222b101bca82e5ba9d5a7acf4a14c0f263d0" + integrity sha512-M/O/4rF2h776hV7qGMZUH3utZLO/jK7p8rnNgGkjKUw8zCGjRQPxB8z6+5l8+VjRUQ3dNYu4vjqXYLr+U8ZVNA== + +vconsole@^3.14.7: + version "3.15.1" + resolved "https://registry.npmmirror.com/vconsole/-/vconsole-3.15.1.tgz#569a8ab15f353259527bbcf004f02946b4482cff" + integrity sha512-KH8XLdrq9T5YHJO/ixrjivHfmF2PC2CdVoK6RWZB4yftMykYIaXY1mxZYAic70vADM54kpMQF+dYmvl5NRNy1g== + dependencies: + "@babel/runtime" "^7.17.2" + copy-text-to-clipboard "^3.0.1" + core-js "^3.11.0" + mutation-observer "^1.0.3" + +weixin-js-sdk@^1.6.0: + version "1.6.5" + resolved "https://registry.npmmirror.com/weixin-js-sdk/-/weixin-js-sdk-1.6.5.tgz#01fe5220b91dbfe089fc0730d061be0e68271e6a" + integrity sha512-Gph1WAWB2YN/lMOFB/ymb+hbU/wYazzJgu6PMMktCy9cSCeW5wA6Zwt0dpahJbJ+RJEwtTv2x9iIu0U4enuVSQ== -- Gitblit v1.9.1