Skip to content

S
self-support
Commit 5358c81b authored by 刘用法's avatar 刘用法
Browse files
Options

选不需要收款的时候，收款金额修改为非必选

parent 0775e789
Expand all Show whitespace changes
Inline Side-by-side
Showing with 27064 additions and 27038 deletions
src/pages.json
View file @ 5358c81b
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
"path": "pages/index/mine", "path": "pages/index/mine",
"style": { "style": {
"navigationBarTitleText": "我的", "navigationBarTitleText": "我的",
"navigationStyle": "custom" "navigationStyle": "custom" ,
"disableScroll": true
} }
}, },
{ {
......
src/pages/index/mine.vue
View file @ 5358c81b
<template> <template>
<view class="mine-view"> <view class="mine-view">
<image class="header-image" mode="widthFix" :src="imageUrl + 'wodebeijing.png'"></image> <image class="header-image" mode="widthFix" :src="wodebeijingImage"></image>
<u-navbar :is-back="false" :background="{ background: 'transparent' }" :border-bottom="false"> <u-navbar :is-back="false" :background="{ background: 'transparent' }" :border-bottom="false">
<text class="title-view">我的</text> <text class="title-view">我的</text>
</u-navbar> </u-navbar>
...@@ -10,10 +10,10 @@ ...@@ -10,10 +10,10 @@
<u-avatar :src="headImageUrl" size="142" mode="circle"></u-avatar> <u-avatar :src="headImageUrl" size="142" mode="circle"></u-avatar>
</view> </view>
<view class="header-content"> <view class="header-content">
<view class="name-view">{{name}}</view> <view class="name-view" @click="handleClickName">{{name}}</view>
<view :class="['tel-view', {'active': info.tel}]"> <view :class="['tel-view', {'active': info.tel}]" @click="handleClickTel">
<text>{{tel}}</text> <text>{{telTip}}</text>
<icon name="arrow-left-fill"></icon> <u-icon class="tel-arrow-icon" name="arrow-up-fill"></u-icon>
</view> </view>
</view> </view>
</view> </view>
...@@ -30,13 +30,13 @@ ...@@ -30,13 +30,13 @@
</view> </view>
</u-cell-group> </u-cell-group>
</view> </view>
<view class="u-m-t-20" @click="take"> <!-- <view class="u-m-t-20" @click="take">
<u-cell-group> <u-cell-group>
<u-cell-item icon="setting" title="相机组件测试"></u-cell-item> <u-cell-item icon="setting" title="相机组件测试"></u-cell-item>
</u-cell-group> </u-cell-group>
</view> -->
</view> </view>
</view> <!-- <take-photo v-if="takeStatus" :currentItem="testData" @close="closeTake"></take-photo> -->
<take-photo v-if="takeStatus" :currentItem="testData" @close="closeTake"></take-photo>
</view> </view>
</template> </template>
...@@ -50,21 +50,21 @@ ...@@ -50,21 +50,21 @@
return { return {
serviceTel: '0755-81773817', serviceTel: '0755-81773817',
info: {}, info: {},
pic: 'https://uviewui.com/common/logo.png', // pic: 'https://uviewui.com/common/logo.png',
show: true, // show: true,
takeStatus: false, // takeStatus: false,
testData: { // testData: {
_id: '1', // 规格ID // _id: '1', // 规格ID
system_id: '2', // 系统ID // system_id: '2', // 系统ID
brand_id: '3', // 品牌ID // brand_id: '3', // 品牌ID
classify_id: '4', // 分类ID // classify_id: '4', // 分类ID
images: [ // 拍照要求示意图 // images: [ // 拍照要求示意图
'https://qn-static.banshouhui.com/live_mark.png', // 'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png', // 'https://qn-static.banshouhui.com/live_mark.png',
'https://qn-static.banshouhui.com/live_mark.png' // 'https://qn-static.banshouhui.com/live_mark.png'
], // ],
main_point: [] // 要点 // main_point: [] // 要点
} // }
} }
}, },
computed: { computed: {
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
name() { name() {
return this.info.name || '点击登录' return this.info.name || '点击登录'
}, },
tel() { telTip() {
return this.info.tel ? '已绑定手机号' : '绑定手机号' return this.info.tel ? '已绑定手机号' : '绑定手机号'
}, },
imageUrl() { imageUrl() {
...@@ -128,6 +128,9 @@ ...@@ -128,6 +128,9 @@
headImageUrl() { headImageUrl() {
return this.info.headImage || this.placeholderImage return this.info.headImage || this.placeholderImage
}, },
wodebeijingImage() {
return this.imageUrl+ 'wodebeijing.png'
},
placeholderImage() { placeholderImage() {
return this.imageUrl + 'touxiang.png' return this.imageUrl + 'touxiang.png'
} }
...@@ -141,14 +144,20 @@ ...@@ -141,14 +144,20 @@
url: 'pages/mine/' + this.pages[index] url: 'pages/mine/' + this.pages[index]
}) })
}, },
take() { handleClickName() {
uni.hideTabBar()
this.takeStatus = true },
handleClickTel() {
}, },
closeTake(img) { // take() {
console.log(img) // uni.hideTabBar()
this.takeStatus = false // this.takeStatus = true
} // },
// closeTake(img) {
// console.log(img)
// this.takeStatus = false
// }
} }
} }
</script> </script>
...@@ -156,6 +165,9 @@ ...@@ -156,6 +165,9 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.mine-view { .mine-view {
position: relative; position: relative;
height: 100vh;
overflow: auto;
background-color: #FFFFFF;
.header-image { .header-image {
position: absolute; position: absolute;
...@@ -170,12 +182,11 @@ ...@@ -170,12 +182,11 @@
padding-left: 30rpx; padding-left: 30rpx;
} }
.mine-content { .mine-content {
background-color: #F4F5F7;
.header-view { .header-view {
padding: 30rpx; padding: 30rpx 30rpx 80rpx 30rpx;
display: flex; display: flex;
align-items: center;
.head-image { .head-image {
width: 142rpx; width: 142rpx;
height: 142rpx; height: 142rpx;
...@@ -183,8 +194,12 @@ ...@@ -183,8 +194,12 @@
.header-content { .header-content {
color: #FFFFFF; color: #FFFFFF;
z-index: 0; z-index: 0;
margin-left: 24rpx;
.name-view { .name-view {
font-size: 44rpx;
font-weight: bold;
margin-bottom: 14rpx;
margin-top: 6rpx;
} }
.tel-view { .tel-view {
background-color: #FFFFFF; background-color: #FFFFFF;
...@@ -192,9 +207,18 @@ ...@@ -192,9 +207,18 @@
color: #2272FF; color: #2272FF;
width: 164rpx; width: 164rpx;
height: 52rpx; height: 52rpx;
font-size: 20rpx;
display: flex;
align-items: center;
justify-content: center;
&.active { &.active {
color: #FFFFFF; color: #FFFFFF;
border: 1rpx bold #FFFFFF; border:2rpx solid #FFFFFF;
background-color: #2272FF;
}
.tel-arrow-icon {
transform:rotate(90deg);
margin-left: 6rpx;
} }
} }
} }
...@@ -203,7 +227,7 @@ ...@@ -203,7 +227,7 @@
.list-view { .list-view {
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 16rpx 16rpx 0 0; border-radius: 16rpx 16rpx 0 0;
overflow: hidden;
.item-title { .item-title {
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
...@@ -219,8 +243,7 @@ ...@@ -219,8 +243,7 @@
.line-view { .line-view {
height: 2rpx; height: 2rpx;
background-color: #F4F5F7; background-color: #F4F5F7;
margin-top: 30rpx; margin: 30rpx;
margin-bottom: 30rpx;
} }
} }
} }
......
src/pages/order/complete.vue
View file @ 5358c81b
...@@ -387,12 +387,19 @@ ...@@ -387,12 +387,19 @@
if(innerItem.fieldsType ==='multiInput'){ if(innerItem.fieldsType ==='multiInput'){
// 多个输入框的值触发 // 多个输入框的值触发
let key = Object.keys(data.value)[0] let key = Object.keys(data.value)[0]
debugger
this.form[key] = data.value[key] this.form[key] = data.value[key]
}else{ }else{
this.$set(this.form,innerItem.fieldsName,data.value) this.$set(this.form,innerItem.fieldsName,data.value)
} }
if (innerItem.fieldsId == 199) { // 选不需要收款的时候，收款金额修改为非必选
for (var item of this.list[0].items) {
for (var i of item.items) {
if (i.fieldsId == 200) {
i.required = data.value !='03'
}
}
}
}
console.log(this.form) console.log(this.form)
}, },
nextStep() { nextStep() {
......
src/uview-ui/components/u-button/u-button.vue
View file @ 5358c81b
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
:send-message-img="sendMessageImg" :send-message-img="sendMessageImg"
:show-message-card="showMessageCard" :show-message-card="showMessageCard"
@getphonenumber="getphonenumber" @getphonenumber="getphonenumber"
@getuserinfo="getuserinfo"
@error="error" @error="error"
@opensetting="opensetting" @opensetting="opensetting"
@launchapp="launchapp" @launchapp="launchapp"
...@@ -324,9 +325,9 @@ export default { ...@@ -324,9 +325,9 @@ export default {
getphonenumber(res) { getphonenumber(res) {
this.$emit('getphonenumber', res); this.$emit('getphonenumber', res);
}, },
// getuserinfo(res) { getuserinfo(res) {
// this.$emit('getuserinfo', res); this.$emit('getuserinfo', res);
// }, },
error(res) { error(res) {
this.$emit('error', res); this.$emit('error', res);
}, },
......
src/uview-ui/components/u-subsection/u-subsection.vue
View file @ 5358c81b
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
* @property {Boolean} bold 激活选项的字体是否加粗（默认true） * @property {Boolean} bold 激活选项的字体是否加粗（默认true）
* @property {String} bg-color 组件背景颜色，mode为button时有效（默认#eeeeef） * @property {String} bg-color 组件背景颜色，mode为button时有效（默认#eeeeef）
* @property {String} button-color 按钮背景颜色，mode为button时有效（默认#ffffff） * @property {String} button-color 按钮背景颜色，mode为button时有效（默认#ffffff）
* @property {String Number} border-radius 圆角值，单位rpx（默认5）
* @event {Function} change 分段器选项发生改变时触发 * @event {Function} change 分段器选项发生改变时触发
* @example <u-subsection active-color="#ff9900"></u-subsection> * @example <u-subsection active-color="#ff9900"></u-subsection>
*/ */
...@@ -92,12 +91,7 @@ ...@@ -92,12 +91,7 @@
vibrateShort: { vibrateShort: {
type: Boolean, type: Boolean,
default: false default: false
}, }
// 圆角值
borderRadius: {
type: [Number, String],
default: 5
},
}, },
data() { data() {
return { return {
...@@ -111,7 +105,7 @@ ...@@ -111,7 +105,7 @@
}, },
currentIndex: this.current, currentIndex: this.current,
buttonPadding: 3, // mode = button 时，组件的内边距 buttonPadding: 3, // mode = button 时，组件的内边距
// borderRadius: 5, // 圆角值 borderRadius: 5, // 圆角值
firstTimeVibrateShort: true // 组件初始化时，会触发current变化，此时不应震动 firstTimeVibrateShort: true // 组件初始化时，会触发current变化，此时不应震动
}; };
}, },
......
src/uview-ui/libs/mixin/mpShare.js
View file @ 5358c81b
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment