clunt
/
dingdong-master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复

This commit is contained in:
donqi 2022-06-23 17:33:19 +08:00
parent d2f9537500
commit 7cc29e8168
3 changed files with 63 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
pages/index/index-home.vue
View File

@ -95,8 +95,8 @@
<view>请您选择入驻类型！到家服务类请选择-服务商；商品销售类请选择-配件商。</view> <view>请您选择入驻类型！到家服务类请选择-服务商；商品销售类请选择-配件商。</view>
</view> </view>
<view class="cu-bar bg-white"> <view class="cu-bar bg-white">
<view class="action margin-0 flex-sub text-black" @tap="hideModal" <view class="action margin-0 flex-sub text-black" @tap="hideModal" @click="chooseEntryType(1)">配件商
@click="chooseEntryType(1)">配件商</view> </view>
<view class="action margin-0 flex-sub text-main-color solid-left" @tap="hideModal" <view class="action margin-0 flex-sub text-main-color solid-left" @tap="hideModal"
@click="chooseEntryType(0)">服务商</view> @click="chooseEntryType(0)">服务商</view>
</view> </view>
@ -111,7 +111,11 @@
<view>2.微信头像</view> <view>2.微信头像</view>
</view> </view>
<view class="cu-bar bg-white"> <view class="cu-bar bg-white">
<view class="action margin-0 flex-sub text-main-color solid-left" @tap="authWxLogin">确认授权</view> <navigator class="modal-bottom-oper margin-0 flex-sub text-black" open-type="exit"
target="miniProgram">拒绝授权
</navigator>
<view class="modal-bottom-oper margin-0 flex-sub text-main-color solid-left" @tap="authWxLogin">确认授权
</view>
</view> </view>
</view> </view>
</view> </view>
@ -122,8 +126,13 @@
<view>授予小程序绑定微信手机号码的权限</view> <view>授予小程序绑定微信手机号码的权限</view>
</view> </view>
<view class="cu-bar bg-white"> <view class="cu-bar bg-white">
<button class="action margin-0 flex-sub cu-btn bg-white text-main-color" open-type="getPhoneNumber" <navigator class="modal-bottom-oper margin-0 flex-sub text-black solid-right" open-type="exit"
@getphonenumber="getPhoneNumber">确认授权</button> target="miniProgram">拒绝授权
</navigator>
<view class="margin-0 flex-sub">
<button class="margin-0 flex-sub cu-btn bg-white text-main-color" open-type="getPhoneNumber"
@getphonenumber="getPhoneNumber">确认授权</button>
</view>
</view> </view>
</view> </view>
</view> </view>
@ -132,7 +141,7 @@
<script> <script>
export default { export default {
name: 'index', name: 'index',
emits: ['changeCurPageCode'], emits: ['changeCurPageCode'],
data() { data() {
return { return {
@ -197,10 +206,10 @@
if (this.isAuthWxPhoneModal) { if (this.isAuthWxPhoneModal) {
return; return;
} }
this.curUserInfo = curUserInfo; this.curUserInfo = curUserInfo;
// 是否展示选择入驻类型的模态框 // 是否展示选择入驻类型的模态框
this.isShowSteer = this.curUserInfo.type != null && this.curUserInfo.type != undefined ? false : true; this.isShowSteer = this.curUserInfo.type != null && this.curUserInfo.type != undefined ? false : true;
this.myInfo = await this.$api.data('myInfo'); this.myInfo = await this.$api.data('myInfo');
// this.isShowSteer = !this.myInfo.entryType; // this.isShowSteer = !this.myInfo.entryType;
@ -217,16 +226,16 @@
} }
this.servModules = newServModules; this.servModules = newServModules;
}, },
async chooseEntryType(typeCode) { async chooseEntryType(typeCode) {
await this.$request.updateWorker({ await this.$request.updateWorker({
type: typeCode type: typeCode
}); });
if (typeCode === 1) { if (typeCode === 1) {
this.$emit('changeCurPageCode', 'supplyChainPage'); this.$emit('changeCurPageCode', 'supplyChainPage');
} else if (typeCode === 0) { } else if (typeCode === 0) {
uni.navigateTo({ uni.navigateTo({
url: '/pages/my/master-settled-info' url: '/pages/my/master-settled-info'
}) })
} }
}, },
hideModal(e) { hideModal(e) {
@ -286,14 +295,14 @@
margin-left: unset !important; margin-left: unset !important;
font-size: 30rpx !important; font-size: 30rpx !important;
} }
.nav-list-panel { .nav-list-panel {
font-weight: 300; font-weight: 300;
} }
.nav-list-panel>navigator:first-child { .nav-list-panel>navigator:first-child {
width: 46%; width: 46%;
height: 249rpx; height: 249rpx;
line-height: 195rpx; line-height: 195rpx;
} }
@ -316,14 +325,21 @@
position: relative; position: relative;
right: -30rpx; right: -30rpx;
border-radius: 40rpx 0 0 40rpx; border-radius: 40rpx 0 0 40rpx;
} }
.clearfix:after { .clearfix:after {
visibility: hidden; visibility: hidden;
display: block; display: block;
font-size: 0; font-size: 0;
content: " "; content: " ";
clear: both; clear: both;
height: 0; height: 0;
}
.modal-bottom-oper {
height: 70rpx;
display: inline-flex;
align-items: center;
justify-content: center;
} }
</style> </style>

2
pages/order-manage/order-manage.vue
View File

@ -479,7 +479,7 @@
this.areaMultiIndex = [colObj.value, 0, 0]; this.areaMultiIndex = [colObj.value, 0, 0];
} else if (colObj.column == 1) { } else if (colObj.column == 1) {
// 通过二级查三级 // 通过二级查三级
let subAreaList = await this.$request.areaListByStep({parentCode: this.regionList[0][colObj.value].areaCode}); let subAreaList = await this.$request.areaListByStep({parentCode: this.areaList[1][colObj.value].areaCode});
subAreaList = subAreaList.data; subAreaList = subAreaList.data;
this.areaList.pop(); this.areaList.pop();
this.areaList.push(subAreaList); this.areaList.push(subAreaList);

17
style/blue/blue-topic.css
View File

@ -45,9 +45,14 @@ radio.main-color.checked .uni-radio-input {
.cu-list.menu>.cu-item.bg-main-color.light { .cu-list.menu>.cu-item.bg-main-color.light {
color: #0081ff; color: #0081ff;
background-color: #cce6ff; background-color: #cce6ff;
} }
.cu-modal .cu-bar>.cu-btn.text-main-color { .cu-modal .cu-bar>.cu-btn.text-main-color {
color: #0081ff; color: #0081ff;
height: 100rpx; height: 100rpx;
} }
.bg-white.text-main-color {
color: #0081ff;
background-color: #ffffff;
}