Commit 48352baa3cbd4e5e85693bda2201d6f4e7ac36c2
1 parent
fd4124d0
修改选择身份图片、装修垃圾页面复选框大小、首页添加地址跳转页面
Showing
8 changed files
with
13 additions
and
18 deletions
garbage-removal/package.json
| @@ -54,6 +54,7 @@ | @@ -54,6 +54,7 @@ | ||
| 54 | "@dcloudio/uni-mp-weixin": "3.0.0-3090620231104002", | 54 | "@dcloudio/uni-mp-weixin": "3.0.0-3090620231104002", |
| 55 | "@dcloudio/uni-mp-xhs": "3.0.0-3090620231104002", | 55 | "@dcloudio/uni-mp-xhs": "3.0.0-3090620231104002", |
| 56 | "@dcloudio/uni-quickapp-webview": "3.0.0-3090620231104002", | 56 | "@dcloudio/uni-quickapp-webview": "3.0.0-3090620231104002", |
| 57 | + "axios": "^0.27.2", | ||
| 57 | "clipboard": "^2.0.11", | 58 | "clipboard": "^2.0.11", |
| 58 | "dayjs": "^1.11.10", | 59 | "dayjs": "^1.11.10", |
| 59 | "js-md5": "^0.8.3", | 60 | "js-md5": "^0.8.3", |
garbage-removal/src/pages/home-info/address/addSite.vue
| @@ -218,6 +218,10 @@ onLoad((options) => { | @@ -218,6 +218,10 @@ onLoad((options) => { | ||
| 218 | addressInfo.garLatitude = addressObj.garLatitude | 218 | addressInfo.garLatitude = addressObj.garLatitude |
| 219 | addFlag.value = false; | 219 | addFlag.value = false; |
| 220 | } | 220 | } |
| 221 | + | ||
| 222 | + if(options.defaultFlag && 'true' == options.defaultFlag){ | ||
| 223 | + addressInfo.defaultFlag = true; | ||
| 224 | + } | ||
| 221 | }) | 225 | }) |
| 222 | const reset = () => { | 226 | const reset = () => { |
| 223 | addressInfo.addressArea = '' | 227 | addressInfo.addressArea = '' |
garbage-removal/src/pages/home-info/clean/index.vue
| @@ -90,12 +90,12 @@ | @@ -90,12 +90,12 @@ | ||
| 90 | </view> | 90 | </view> |
| 91 | <view style="width:100%;display: flex;justify-content: flex-start;align-items: center; "> | 91 | <view style="width:100%;display: flex;justify-content: flex-start;align-items: center; "> |
| 92 | <view style="display: flex; align-items: center;"> | 92 | <view style="display: flex; align-items: center;"> |
| 93 | - <up-radio-group shape="square" size="30" v-model="paramFrom.garInCarStore" placement="row" | 93 | + <up-radio-group shape="square" size="34" v-model="paramFrom.garInCarStore" placement="row" |
| 94 | @change="handleInCarClick"> | 94 | @change="handleInCarClick"> |
| 95 | - <up-radio activeColor="#19a97c" labelSize="30" :customStyle="{ marginRight: '30rpx' }" label="需要" | 95 | + <up-radio activeColor="#19a97c" labelSize="32" iconSize="30" :customStyle="{ marginRight: '30rpx' }" label="需要" |
| 96 | :name="true"> | 96 | :name="true"> |
| 97 | </up-radio> | 97 | </up-radio> |
| 98 | - <up-radio activeColor="#19a97c" labelSize="30" :customStyle="{ marginRight: '30rp' }" label="不需要" | 98 | + <up-radio activeColor="#19a97c" labelSize="32" iconSize="30" :customStyle="{ marginRight: '30rp' }" label="不需要" |
| 99 | :name="false"> | 99 | :name="false"> |
| 100 | </up-radio> | 100 | </up-radio> |
| 101 | </up-radio-group> | 101 | </up-radio-group> |
| @@ -128,8 +128,8 @@ | @@ -128,8 +128,8 @@ | ||
| 128 | <view class="company-clean-container-site-image-info-sure-button-radio"> | 128 | <view class="company-clean-container-site-image-info-sure-button-radio"> |
| 129 | <view @click="changeAgree"> | 129 | <view @click="changeAgree"> |
| 130 | <u-checkbox-group v-model="paramFrom.sureReadFlag" placement="row"> | 130 | <u-checkbox-group v-model="paramFrom.sureReadFlag" placement="row"> |
| 131 | - <u-checkbox activeColor="#19a97c" :customStyle="{ marginBottom: '0px', marginTop: '1px' }" size="28" | ||
| 132 | - labelSize="28" shape="square" :key="0" :name="true" :labelDisabled="true" | 131 | + <u-checkbox activeColor="#19a97c" :customStyle="{ marginBottom: '0px', marginTop: '1px' }" size="30" |
| 132 | + labelSize="28" shape="square" :key="0" :name="true" :labelDisabled="true" iconSize="28" | ||
| 133 | labelColor="#909399"></u-checkbox> | 133 | labelColor="#909399"></u-checkbox> |
| 134 | </u-checkbox-group> | 134 | </u-checkbox-group> |
| 135 | </view> | 135 | </view> |
garbage-removal/src/pages/home/index.vue
| @@ -321,19 +321,9 @@ const handleCleanClick = () => { | @@ -321,19 +321,9 @@ const handleCleanClick = () => { | ||
| 321 | } else { | 321 | } else { |
| 322 | // 用户已登录但是没有清运地址的情况 | 322 | // 用户已登录但是没有清运地址的情况 |
| 323 | if (userType.value == '用户') { | 323 | if (userType.value == '用户') { |
| 324 | - uni.showModal({ | ||
| 325 | - title: '提示', | ||
| 326 | - content: prompt.value, | ||
| 327 | - success: function (res) { | ||
| 328 | - if (res.confirm) { | ||
| 329 | - uni.$u.route({ | ||
| 330 | - url: `pages/home-info/address/index`, | ||
| 331 | - }) | ||
| 332 | - } else if (res.cancel) { | ||
| 333 | - console.log('用户点击取消'); | ||
| 334 | - } | ||
| 335 | - } | ||
| 336 | - }); | 324 | + uni.$u.route({ |
| 325 | + url: `pages/home-info/address/addSite?defaultFlag=true`, | ||
| 326 | + }); | ||
| 337 | } else { | 327 | } else { |
| 338 | uni.showModal({ | 328 | uni.showModal({ |
| 339 | title: '提示', | 329 | title: '提示', |
garbage-removal/src/static/image/role/company.png
garbage-removal/src/static/image/role/disposal.png
garbage-removal/src/static/image/role/handler.png
garbage-removal/src/static/image/role/user.png
