xiangshan
/
yxxh5
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

更新

This commit is contained in:
lnn19986213 2024-01-26 17:20:40 +08:00
parent 91c80d7c8c
commit 41e0c0dc71
13 changed files with 318 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pagesA/my/My.vue
View File

@ -12,7 +12,11 @@
</view> </view>
<view class="user_name"> <view class="user_name">
<view class="user_name_de"> <view class="user_name_de">
<view style="display: flex; ">
<view style="width: 50%;">
{{ userName }} {{ userName }}
</view>
<view class="sf_textA" v-if="yhsf == '文艺工作者'"> <view class="sf_textA" v-if="yhsf == '文艺工作者'">
<image src="../../static/sfFws.png"></image> <image src="../../static/sfFws.png"></image>
</view> </view>
@ -20,6 +24,11 @@
<image src="../../static/sfRc.png"></image> <image src="../../static/sfRc.png"></image>
</view> </view>
</view> </view>
<view style="width: 100%; font-size: 32rpx;">
{{ association }}
</view>
</view>
</view> </view>
<view class="arrow"> <view class="arrow">
<image src="../../static/rightArrow.png" mode=""></image> <image src="../../static/rightArrow.png" mode=""></image>
@ -153,6 +162,7 @@
titleHeight: 90, titleHeight: 90,
isAdmin: null, isAdmin: null,
isVillageAdmin: null, isVillageAdmin: null,
association: '',
}; };
}, },
onReady() { onReady() {
@ -185,6 +195,7 @@
this.userId = res.data.id; this.userId = res.data.id;
this.yhsf = res.data.yhsf; this.yhsf = res.data.yhsf;
this.point = res.data.point; this.point = res.data.point;
this.association = res.data.association.name
this.getCol(); this.getCol();
} }
}) })
@ -415,6 +426,7 @@
font-size: 40rpx; font-size: 40rpx;
font-weight: 600; font-weight: 600;
.sf_textA { .sf_textA {
width: 146rpx; width: 146rpx;
height: 48rpx; height: 48rpx;

4
src/pagesA/my/myCollection.vue
View File

@ -204,9 +204,7 @@
}); });
}) })
}else { }else {
this.http.request('/works/details', { this.http.request('/works/details/' + this.sonId, {}, "GET").then(res => {
id: this.sonId
}, "GET").then(res => {
if (res.code == 200) { if (res.code == 200) {
if(!res.data.isColl){ if(!res.data.isColl){
this.list.splice(this.sonNum,1) this.list.splice(this.sonNum,1)

102
src/pagesB/ConfirmOrder/fictitiousOrder.vue
View File

@ -38,15 +38,27 @@
</view> </view>
<view class="" v-if="item.sendWay == '3'"> <view class="" v-if="item.sendWay == '3'">
<view> <view>
默认地址 默认地址:
</view> </view>
<view>4564864afdvsdag645sdf</view> <view>{{item.addName}}</view>
<u-button text="更换地址" throttleTime=1000 color="#99241B" > <view>{{item.addDet}}</view>
<u-button text="更换地址" throttleTime=1000 color="#99241B" @click="changeAddress(index)">
</u-button> </u-button>
</view> </view>
</view> </view>
</view> </view>
<u-gap height="84" bgColor="#fff"></u-gap> <u-popup :show="showAddList" @close="close" closeOnClickOverlay :round="5" customStyle="padding: 16px;">
<u-radio-group @change="selectFormB" v-model="radiovalue1" :borderBottom="true" placement="column"
iconPlacement="right">
<u-radio :customStyle="{marginBottom: '16px' }" v-for="(item, index) in radiolist1" :key="index"
:label="item.label" labelSize="28rpx" labelColor="#231F1C" :name="item.id"
activeColor="#99241B ">
</u-radio>
<u-button class="custom-style" style="background-color:#99241B ; color: #FFFFFF; margin-top: 32rpx;"
type="default" @click="showAddList=false">确认</u-button>
</u-radio-group>
</u-popup>
<u-gap height="84" bgColor="#F4F5F7"></u-gap>
<view class="bottom_opration"> <view class="bottom_opration">
<view class="txt"> <view class="txt">
<text>合计：</text> <text class="total_prc_color">{{total}}积分</text> <text>合计：</text> <text class="total_prc_color">{{total}}积分</text>
@ -69,6 +81,13 @@
point: '', point: '',
value1: '', value1: '',
addressList: [], addressList: [],
addName: '',
addDet: '',
addressId: '',
showAddList: false,
radiovalue1: '',
radiolist1: [],
changeNum: null,
}; };
}, },
onLoad(option) { onLoad(option) {
@ -77,6 +96,7 @@
}, },
onShow() { onShow() {
this.total = 0 this.total = 0
this.radiolist1 = []
this.getTotal() this.getTotal()
this.getUserInfo() this.getUserInfo()
this.getAddress() this.getAddress()
@ -86,6 +106,25 @@
this.http.request('/address/list', {}, "GET").then(res => { this.http.request('/address/list', {}, "GET").then(res => {
if (res.code == 200) { if (res.code == 200) {
this.addressList = res.data this.addressList = res.data
this.addressList.forEach(item => {
if (item.isDefault) {
this.addName = item.userName
this.addressId = item.id
this.addDet = item.province + item.city + item.area + item.userAddress
}
this.radiolist1.push({
id: item.id,
label: item.userName + '：' + item.province + item.city + item
.area + item.userAddress
})
})
this.data.forEach(ele => {
if (ele.sendWay == '3') {
ele.addressId = this.addressId,
ele.addName = this.addName
ele.addDet = this.addDet
}
})
} }
}).catch(e => { }).catch(e => {
uni.showToast({ uni.showToast({
@ -119,20 +158,33 @@
pay() { pay() {
if (this.total > this.point) { if (this.total > this.point) {
uni.navigateTo({ uni.navigateTo({
url:'/pagesB/ConfirmOrder/purchaseDetail?success=1' + '&id=' + this.data[0].id + '&num=' + this.data.length url: '/pagesB/ConfirmOrder/purchaseDetail?success=1' + '&id=' + this.data[0].id + '&num=' +
this.data.length
}) })
} else { } else {
let data = [] let arr = []
console.log(this.data)
let can = true
this.data.forEach(function(item) { this.data.forEach(function(item) {
data.push({ if (item.sendWay == '2' && item.remark == '') {
uni.showToast({
title: '请填写买家联系方式',
icon: "none",
});
can = false
return
} else {
arr.push({
goodsId: item.goodsId, goodsId: item.goodsId,
count: item.count, count: item.count,
addressId: item.addressId, addressId: item.addressId,
remark: item.remark, remark: item.remark,
shopCarId: item.shopCarId, shopCarId: item.shopCarId,
}) })
}
}) })
this.http.request('/order/newOrder', data, "POST").then(res => { if(can){
this.http.request('/order/newOrder', arr, "POST").then(res => {
if (res.code == 200) { if (res.code == 200) {
uni.navigateTo({ uni.navigateTo({
url:'/pagesB/ConfirmOrder/purchaseDetail?success=0' + '&id=' + this.data[0].id + '&num=' + this.data.length url:'/pagesB/ConfirmOrder/purchaseDetail?success=0' + '&id=' + this.data[0].id + '&num=' + this.data.length
@ -145,6 +197,24 @@
}); });
}) })
} }
}
},
close() {
this.showAddList = false
},
selectFormB(form) {
this.addressList.forEach(item => {
if (item.id == form) {
this.data[this.changeNum].addressId = item.id
this.data[this.changeNum].addName = item.userName
this.data[this.changeNum].addDet = item.province + item.city + item.area + item.userAddress
}
})
},
changeAddress(val) {
this.showAddList = true
this.changeNum = val
} }
} }
} }
@ -154,9 +224,11 @@
page { page {
background-color: #F4F5F7; background-color: #F4F5F7;
} }
image { image {
vertical-align: middle; vertical-align: middle;
} }
.person_des { .person_des {
display: flex; display: flex;
@ -169,6 +241,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.info_txt { .info_txt {
font-weight: 600; font-weight: 600;
font-size: 32rpx; font-size: 32rpx;
@ -184,6 +257,7 @@
.goods_itm_top { .goods_itm_top {
display: flex; display: flex;
align-items: center; align-items: center;
.goods_itm_top_title { .goods_itm_top_title {
margin-left: 10px; margin-left: 10px;
font-size: 16px; font-size: 16px;
@ -194,9 +268,11 @@
.goods_itm_bott { .goods_itm_bott {
margin-top: 16rpx; margin-top: 16rpx;
display: flex; display: flex;
.goods_itm_bott_left { .goods_itm_bott_left {
flex: 1; flex: 1;
margin-left: 36rpx; margin-left: 36rpx;
.goods_itm_bott_left_count { .goods_itm_bott_left_count {
color: $gray; color: $gray;
display: flex; display: flex;
@ -211,27 +287,32 @@
.price_box { .price_box {
background-color: #FFFFFF; background-color: #FFFFFF;
.price_tit { .price_tit {
font-weight: 600; font-weight: 600;
border-bottom: 1rpx #E0E0E0 solid; border-bottom: 1rpx #E0E0E0 solid;
padding-bottom: 32rpx; padding-bottom: 32rpx;
} }
.price_total { .price_total {
width: 100%; width: 100%;
height: 32px; height: 32px;
line-height: 32px; line-height: 32px;
overflow: hidden; overflow: hidden;
.price_total_left { .price_total_left {
float: left; float: left;
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
} }
.price_total_right { .price_total_right {
float: right; float: right;
font-size: 16px; font-size: 16px;
font-weight: 600; font-weight: 600;
} }
} }
.express_price { .express_price {
padding: 24rpx 0; padding: 24rpx 0;
display: flex; display: flex;
@ -239,6 +320,7 @@
align-items: center; align-items: center;
} }
} }
.pay_methods { .pay_methods {
display: flex; display: flex;
@ -246,6 +328,7 @@
align-items: center; align-items: center;
font-weight: 600; font-weight: 600;
} }
// 辅助 // 辅助
.bg_col_cirle_margin { .bg_col_cirle_margin {
background-color: #FFFFFF; background-color: #FFFFFF;
@ -257,6 +340,7 @@
padding: 32rpx; padding: 32rpx;
box-sizing: border-box; box-sizing: border-box;
} }
.bottom_opration { .bottom_opration {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
@ -269,9 +353,11 @@
display: flex; display: flex;
align-items: center; align-items: center;
height: 166rpx; height: 166rpx;
.txt { .txt {
display: flex; display: flex;
align-items: center; align-items: center;
.total_prc_color { .total_prc_color {
font-weight: 600; font-weight: 600;
color: #FF6600; color: #FF6600;

8
src/pagesB/ConfirmOrder/purchaseDetail.vue
View File

@ -11,6 +11,9 @@
<view class="button" @click="toDetail()"> <view class="button" @click="toDetail()">
查看订单 查看订单
</view> </view>
<view class="button" @click="toShop()">
返回
</view>
</view> </view>
<view v-else-if="success == 1"> <view v-else-if="success == 1">
<view class="error_box"> <view class="error_box">
@ -49,6 +52,11 @@
}, },
returnBack() { returnBack() {
uni.navigateBack() uni.navigateBack()
},
toShop() {
uni.redirectTo({
url: "/pagesC/shop/Shop?typesOf=1"
});
} }
} }
} }

10
src/pagesB/MyOrder/MyOrder.vue
View File

@ -186,12 +186,9 @@
size: this.size size: this.size
}, "GET").then(res => { }, "GET").then(res => {
if (res.code == 200) { if (res.code == 200) {
console.log(1)
res.data.records.forEach(function(item) { res.data.records.forEach(function(item) {
let data = JSON.parse(item.quickPhoto) let data = JSON.parse(item.quickPhoto)
item.quickPhoto = data item.quickPhoto = data
console.log(2,item.quickPhoto)
if (item.quickPhoto.domainInfo.file) { if (item.quickPhoto.domainInfo.file) {
let fileArr = item.quickPhoto.domainInfo.file.split(',') let fileArr = item.quickPhoto.domainInfo.file.split(',')
let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1) let gs = fileArr[0].substr(fileArr[0].lastIndexOf(".") + 1)
@ -206,7 +203,6 @@
let img = item.quickPhoto.shopInfo.images.split(',') let img = item.quickPhoto.shopInfo.images.split(',')
item.quickPhoto.shopInfo.images = img[0] item.quickPhoto.shopInfo.images = img[0]
}) })
console.log(3)
this.orderList = res.data.records this.orderList = res.data.records
this.load = false this.load = false
} }
@ -281,7 +277,7 @@
item.quickPhoto.domainInfo.file = '../../static/fileImg/pdfS.png' item.quickPhoto.domainInfo.file = '../../static/fileImg/pdfS.png'
} }
} }
let img = JSON.parse(item.quickPhoto.shopInfo.images) let img = item.quickPhoto.shopInfo.images.split(',')
item.quickPhoto.shopInfo.images = img[0] item.quickPhoto.shopInfo.images = img[0]
}) })
this.orderList = res.data.records this.orderList = res.data.records
@ -317,7 +313,7 @@
item.quickPhoto.domainInfo.file = '../../static/fileImg/pdfS.png' item.quickPhoto.domainInfo.file = '../../static/fileImg/pdfS.png'
} }
} }
let img = JSON.parse(item.quickPhoto.shopInfo.images) let img = item.quickPhoto.shopInfo.images.split(',')
item.quickPhoto.shopInfo.images = img[0] item.quickPhoto.shopInfo.images = img[0]
_this.orderList.push(item) _this.orderList.push(item)
}) })
@ -350,7 +346,7 @@
//详情 //详情
toDetail(val) { toDetail(val) {
uni.navigateTo({ uni.navigateTo({
url: "/pagesB/MyOrder/fictitiousDetail?id=" + val url: "/pagesB/MyOrder/fictitiousDetail?id=" + val + '&cho=' + this.cho
}) })
}, },
//评价 //评价

110
src/pagesB/MyOrder/fictitiousDetail.vue
View File

@ -4,6 +4,7 @@
<u-loading-page :loading="load"></u-loading-page> <u-loading-page :loading="load"></u-loading-page>
</view> </view>
<view v-if="load == false"> <view v-if="load == false">
<u-gap height="1" bgColor="#fff"></u-gap>
<view class="goods_box bg_col_cirle_margin"> <view class="goods_box bg_col_cirle_margin">
<view class="goods_itm"> <view class="goods_itm">
<view class="goods_itm_top"> <view class="goods_itm_top">
@ -22,8 +23,13 @@
</view> </view>
</view> </view>
</view> </view>
<view class="price_box bg_col_cirle_margin" v-if="state == 1 && cho == 1">
<u--input placeholder="请输入快递单号" v-model="courierNum" clearable
style="color: #251B1D;">
</u--input>
</view>
<view class="price_box bg_col_cirle_margin"> <view class="price_box bg_col_cirle_margin" v-if="sendWay == '1'">
<view class="price_tit"> <view class="price_tit">
取货链接 取货链接
</view> </view>
@ -38,6 +44,31 @@
提取码：{{item.pass}} 提取码：{{item.pass}}
</view> </view>
</view> </view>
<view class="price_box bg_col_cirle_margin" v-else-if="sendWay == '2' ">
<view class="price_tit">
买家联系方式
</view>
<view class="word_link_pas">
{{det.remark}}
</view>
</view>
<view class="price_box bg_col_cirle_margin" v-else-if="sendWay == '3' ">
<view class="price_tit">
买家收货地址
</view>
<view class="word_link" style="width: 100%;">
{{addName}}
</view>
<view class="word_link_pas">
{{addDet}}
</view>
</view>
<view class="operation" v-else-if="state == 3 && cho == 0">
<button type="default" class="next" @click="next">确认收货</button>
</view>
<view class="operation" v-else-if="state == 1 && cho == 1">
<button type="default" class="next" @click="toOut">发货</button>
</view>
</view> </view>
</view> </view>
@ -51,10 +82,16 @@
id: '', id: '',
item:{}, item:{},
det: {}, det: {},
sendWay: '',
state: '',
courierNum: '',
addName: '',
addDet: '',
}; };
}, },
onLoad(o) { onLoad(o) {
this.id = o.id this.id = o.id
this.cho = o.cho
}, },
onShow() { onShow() {
this.getData() this.getData()
@ -76,7 +113,11 @@
} }
this.item.url = res.data.quickPhoto.panUrl this.item.url = res.data.quickPhoto.panUrl
this.item.pass = res.data.quickPhoto.panCode this.item.pass = res.data.quickPhoto.panCode
this.sendWay = res.data.domain.sendWay
this.det = res.data this.det = res.data
this.state = res.data.state
this.addName = res.data.userName
this.addDet = res.data.province + res.data.city + res.data.area + res.data.userAddress
this.load = false this.load = false
} }
}).catch(e => { }).catch(e => {
@ -114,6 +155,41 @@
} }
}); });
}, },
next() {
this.http.request('/order/confirm?orderId=' + this.id, {}, "POST").then(res => {
if (res.code == 200) {
uni.showToast({
title: '收货成功',
icon: "none",
});
this.getData()
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
toOut() {
this.http.request('/order/send', {
courierNum: this.courierNum,
orderId:this.id
}, "GET").then(res => {
if (res.code == 200) {
uni.showToast({
title: '发货成功',
icon: "none",
});
this.getData()
}
}).catch(e => {
uni.showToast({
title: e.data.message,
icon: "none",
});
})
},
} }
} }
</script> </script>
@ -203,4 +279,36 @@
padding: 32rpx; padding: 32rpx;
box-sizing: border-box; box-sizing: border-box;
} }
.operation {
display: flex;
justify-content: space-between;
align-items: center;
padding: 32rpx 32rpx 48rpx;
position: fixed;
left: 0;
bottom: 0;
right: 0;
background-color: #FFFFFF;
box-shadow: 0px -4px 10px 1px rgba(192, 192, 192, 0.12);
.next {
width: calc(100% - 48rpx);
height: 80rpx;
line-height: 80rpx;
background-color: #99241B;
color: #fff;
font-size: 32rpx;
font-weight: 600;
border: none;
button {
&::after {
border: none;
}
}
}
}
</style> </style>

4
src/pagesB/PersonalCenter/ReEditSingleInfo.vue
View File

@ -29,14 +29,14 @@
<view class="date m16" @click="DatePicker" <view class="date m16" @click="DatePicker"
v-if="Edkey=='出生年月'||Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'"> v-if="Edkey=='出生年月'||Edkey=='入会时间'||Edkey=='服务开始时间'||Edkey=='服务结束时间'">
<u--input class='p32 gray' readonly v-model="Edvalue" > <u--input class='p32 gray' readonly v-model="Edvalue" placeholder="请选择" >
<u-icon slot="suffix" name="calendar"></u-icon> <u-icon slot="suffix" name="calendar"></u-icon>
</u--input> </u--input>
</view> </view>
<!-- 政治面貌 民族 籍贯 选择 input--> <!-- 政治面貌 民族 籍贯 选择 input-->
<view class="select m16" @click="zhengzhiShow=true" <view class="select m16" @click="zhengzhiShow=true"
v-if="Edkey=='政治面貌'||Edkey=='会员级别'||Edkey=='所属协会'||Edkey=='学历'"> v-if="Edkey=='政治面貌'||Edkey=='会员级别'||Edkey=='所属协会'||Edkey=='学历'">
<u--input class="p32 gray" readonly v-model="Edvalue" > <u--input class="p32 gray" readonly v-model="Edvalue" placeholder="请选择" >
<u-icon slot="suffix" name="arrow-right"></u-icon> <u-icon slot="suffix" name="arrow-right"></u-icon>
</u--input> </u--input>
</view> </view>

8
src/pagesB/improveData/improveData.vue
View File

@ -70,7 +70,7 @@
</view> </view>
<view class="data_itm_box"> <view class="data_itm_box">
<u-form-item prop="userInfo.pasw" ref="item1" class="data_itm"> <u-form-item prop="userInfo.pasw" ref="item1" class="data_itm">
<text class="label_t"><text style="color: #99241B;">*</text>密码</text> <text class="label_t">密码</text>
<u--input class="p32" placeholder="请设置登录密码" inputAlign="right" clearable <u--input class="p32" placeholder="请设置登录密码" inputAlign="right" clearable
v-model="model1.userInfo.pasw" border="none"></u--input> v-model="model1.userInfo.pasw" border="none"></u--input>
</u-form-item> </u-form-item>
@ -364,14 +364,10 @@
userData: {}, userData: {},
rules: { rules: {
'userInfo.pasw': [{ 'userInfo.pasw': [{
required: true,
message: '请设置登录密码',
trigger: ['blur', 'change']
}, {
min: 6, min: 6,
max: 20, max: 20,
message: '密码需由长度不小于12位的大小写英文、数字及特殊符号组成!', message: '密码需由长度不小于12位的大小写英文、数字及特殊符号组成!',
trigger: ['blur', 'change'] trigger: ['change']
},], },],
'userInfo.serverInstrutor': [{ 'userInfo.serverInstrutor': [{
type: 'string', type: 'string',

14
src/pagesB/literFamily/ActJianDetail.vue
View File

@ -4,7 +4,7 @@
<u-loading-page :loading="load"></u-loading-page> <u-loading-page :loading="load"></u-loading-page>
</view> </view>
<view class="workDetail" v-if="load == false"> <view class="workDetail" v-if="load == false">
<u-swiper :list="list" :autoplay="true" @change="e => currentNum = e.current" indicatorStyle="right: 20px" height="300px"> <u-swiper :list="list" :autoplay="true" @change="e => currentNum = e.current" indicatorStyle="right: 20px" height="300px" imgMode="aspectFit">
<view slot="indicator" class="indicator-num"> <view slot="indicator" class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text> <text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
</view> </view>
@ -17,10 +17,7 @@
<!-- 作品名称自由生活向美而生作品 --> <!-- 作品名称自由生活向美而生作品 -->
{{actDetObj.title}} {{actDetObj.title}}
</view> </view>
<view class="work_desc">
<!-- 摄影作品摄影作品摄影作品摄影作品摄影作品介绍作品介绍摄影作品自由生活向美而生作品 -->
{{actDetObj.record}}
</view>
<view class="work_det"> <view class="work_det">
<view class="det_box"> <view class="det_box">
<view class="box_left"> <view class="box_left">
@ -40,6 +37,11 @@
<!-- 1288浏览 --> <!-- 1288浏览 -->
</view> </view>
</view> </view>
</view>
<view class="work_desc">
<!-- 摄影作品摄影作品摄影作品摄影作品摄影作品介绍作品介绍摄影作品自由生活向美而生作品 -->
<!-- {{actDetObj.record}} -->
<u-parse :content="actDetObj.record"></u-parse>
</view> </view>
<!-- <image v-if="list.length > 0" v-for="item in list" :src="item" mode="widthFix" alt="" class="decTmgs"></image> --> <!-- <image v-if="list.length > 0" v-for="item in list" :src="item" mode="widthFix" alt="" class="decTmgs"></image> -->
</view> </view>
@ -129,7 +131,7 @@
.work_desc { .work_desc {
width: 94%; width: 94%;
margin: 10px 3%; margin: 10px 3% 20px;
font-size: 12px; font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC; font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400; font-weight: 400;

6
src/pagesB/literFamily/literFamily.vue
View File

@ -158,6 +158,10 @@
this.http.request('/culturalCreativity/list', {}, "GET").then(res => { this.http.request('/culturalCreativity/list', {}, "GET").then(res => {
if (res.code == 200) { if (res.code == 200) {
this.list2 = res.data.records.splice(0,3) this.list2 = res.data.records.splice(0,3)
this.list2.forEach(item => {
let img = item.image.split(',')[0]
item.image = img
})
this.load = false this.load = false
} }
}).catch(e => { }).catch(e => {
@ -278,7 +282,7 @@
} }
.layout { .layout {
padding: 0 16px; padding: 0 16px 16px;
box-sizing: border-box; box-sizing: border-box;
.activityColumn { .activityColumn {

2
src/pagesC/AwardWinningWork/AwardDetail.vue
View File

@ -4,7 +4,7 @@
<u-loading-page :loading="load"></u-loading-page> <u-loading-page :loading="load"></u-loading-page>
</view> </view>
<view class="workDetail" v-if="load == false"> <view class="workDetail" v-if="load == false">
<u-swiper :list="list" :autoplay="true" @change="e => currentNum = e.current" indicatorStyle="right: 20px" height="300px"> <u-swiper :list="list" :autoplay="true" @change="e => currentNum = e.current" indicatorStyle="right: 20px" height="300px" imgMode="aspectFit">
<view slot="indicator" class="indicator-num"> <view slot="indicator" class="indicator-num">
<text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text> <text class="indicator-num__text">{{ currentNum + 1 }}/{{ list.length }}</text>
</view> </view>

9
src/pagesC/AwardWinningWork/AwardWinningWork.vue
View File

@ -17,7 +17,6 @@
<text class="rewardWorkTitle">{{v.name}}</text> <text class="rewardWorkTitle">{{v.name}}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
@ -80,6 +79,10 @@
associationId: this.associationId associationId: this.associationId
}, "GET").then(res => { }, "GET").then(res => {
if (res.code == 200) { if (res.code == 200) {
res.data.records.forEach(item => {
let img = item.image.split(',')[0]
item.image = img
})
this.fightVirusList = res.data.records this.fightVirusList = res.data.records
this.load = false this.load = false
} }
@ -140,15 +143,17 @@
background-color: #F4F5F7; background-color: #F4F5F7;
} }
.layout{ .layout{
padding: 0 24rpx; padding: 0 24rpx 16px;
box-sizing: border-box; box-sizing: border-box;
.reward { .reward {
// padding: 24rpx; // padding: 24rpx;
width: 702rpx;
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
justify-content: space-between; justify-content: space-between;
.reward_itm { .reward_itm {
width: 340rpx;
margin-top: 20rpx; margin-top: 20rpx;
box-sizing: border-box; box-sizing: border-box;
border-radius: 16rpx; border-radius: 16rpx;

3
src/pagesC/ShoppingCart/ShoppingCart.vue
View File

@ -285,7 +285,8 @@
userImg: item.goods.shopInfo.images, userImg: item.goods.shopInfo.images,
mType: '1', mType: '1',
money: item.goods.pointPrice, money: item.goods.pointPrice,
count: item.count count: item.count,
remark: '',
}) })
} }
}) })