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

gx

This commit is contained in:
lnn19986213 2023-04-13 10:40:49 +08:00
parent dbfd20f2a0
commit 7229361393
7 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pages/ArtWorks/ArtWorks.vue
View File

@ -30,11 +30,11 @@
<view class="gpRight"> <view class="gpRight">
<scroll-view class="gprTop" scroll-x="true"> <scroll-view class="gprTop" scroll-x="true">
<view class="gprtItem_C" v-if="fil == 1"> <view class="gprtItem_C" v-if="fil == 1">
热销商品 热销作品
<view class="line"></view> <view class="line"></view>
</view> </view>
<view class="gprtItem_C" v-else-if="typeO == 0"> <view class="gprtItem_C" v-else-if="typeO == 0">
全部商品 全部作品
<view class="line"></view> <view class="line"></view>
</view> </view>
<view v-for="(item,index) in list2" :key="index" @click="chooseTwoType(item.value,index)" :class="typeT == index?'gprtItem_C':'gprtItem'"> <view v-for="(item,index) in list2" :key="index" @click="chooseTwoType(item.value,index)" :class="typeT == index?'gprtItem_C':'gprtItem'">
@ -289,7 +289,12 @@
}, },
//选择一级类型 //选择一级类型
chooseOneType(item,index) { chooseOneType(item,index) {
this.type = item if(index == 0){
this.type = ''
}else{
this.type = item
this.getTypeE()
}
this.typeO = index this.typeO = index
this.fil = 0 this.fil = 0
this.typeT = 9999 this.typeT = 9999
@ -297,7 +302,6 @@
this.list2 = [] this.list2 = []
this.orderBy = '' this.orderBy = ''
this.pages = 1 this.pages = 1
this.getTypeE()
this.getData() this.getData()
}, },
//选择二级类型 //选择二级类型

7
src/pages/MyOrder/MyOrder.vue
View File

@ -37,7 +37,8 @@
</u-tabs> </u-tabs>
</view> </view>
<u-gap :style="{'height':(statusHeight+titleHeight+80)+'px'}" bgColor="#ffffff"></u-gap> <view :style="{'height':(statusHeight+titleHeight+80)+'px'}" style="width: 100%; background-color: #fff;"></view>
<!-- <u-gap :style="{'height':(statusHeight+titleHeight+80)+'px'}" bgColor="#ffffff"></u-gap> -->
<u-empty v-if="orderList.length == 0" mode="order" icon="../../static/orderE.png" marginTop='60'> <u-empty v-if="orderList.length == 0" mode="order" icon="../../static/orderE.png" marginTop='60'>
</u-empty> </u-empty>
@ -65,11 +66,11 @@
<view class="count" @click="toDetail(v.id)"> <view class="count" @click="toDetail(v.id)">
<text style="color:#AFADB0;">x{{v.count}}</text> <text style="color:#AFADB0;">x{{v.count}}</text>
<view class="ss" v-if="v.totalPrice > 0"> <view class="ss" v-if="v.totalPrice > 0">
<text style="color:#AFADB0;">合计</text><text <text style="color:#AFADB0;">合计:</text><text
style="font-size: 16px;font-weight: 600;">￥{{v.totalPrice}}</text> style="font-size: 16px;font-weight: 600;">￥{{v.totalPrice}}</text>
</view> </view>
<view class="ss" v-else> <view class="ss" v-else>
<text style="color:#AFADB0;">合计</text><text <text style="color:#AFADB0;">合计:</text><text
style="font-size: 16px;font-weight: 600;">{{v.totalPoint}}积分</text> style="font-size: 16px;font-weight: 600;">{{v.totalPoint}}积分</text>
</view> </view>
</view> </view>

11
src/pages/ShoppingCart/ShoppingCart.vue
View File

@ -51,7 +51,7 @@
<view class="shou_main_right" v-if="v.goods.moneyPrice > 0"> <view class="shou_main_right" v-if="v.goods.moneyPrice > 0">
{{v.goods.moneyPrice}}元 {{v.goods.moneyPrice}}元
</view> </view>
<view class="shou_main_right" v-else-if="v.goods.pointPrice > 0"> <view class="shou_main_right" v-else>
{{v.goods.pointPrice}}积分 {{v.goods.pointPrice}}积分
</view> </view>
</view> </view>
@ -72,7 +72,9 @@
<u-button class="custom-style" text="结算"></u-button> <u-button class="custom-style" text="结算"></u-button>
</view> </view>
<view class="money_num"> <view class="money_num">
合计：<text class="number" v-if="allMoney>0">{{allMoney}}元</text><text class="number" v-else-if="allPoint>0">{{allPoint}}积分</text> 合计：
<text class="number" v-if="allMoney>0">{{allMoney}}元</text>
<text class="number" v-else>{{allPoint}}积分</text>
</view> </view>
</view> </view>
@ -120,7 +122,7 @@
onShow() { onShow() {
this.allMoney = 0 this.allMoney = 0
this.allPoint = 0 this.allPoint = 0
this.pages = 0 this.pages = 1
this.getData() this.getData()
this.getUserInfo() this.getUserInfo()
}, },
@ -273,7 +275,8 @@
if(item.checked == 1){ if(item.checked == 1){
_this.orderDet.push({ _this.orderDet.push({
count: item.count, count: item.count,
goodsId: item.goodsId goodsId: item.goodsId,
shopCarId: item.id
}) })
} }
}) })

6
src/pages/activity/activity.vue
View File

@ -71,6 +71,11 @@
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
}, 1000); }, 1000);
}, },
//上拉
onReachBottom() {
this.pages++
this.getData();
},
methods:{ methods:{
toDetail(val){ toDetail(val){
uni.navigateTo({ uni.navigateTo({
@ -132,6 +137,7 @@
padding: 0 16px; padding: 0 16px;
z-index: 999; z-index: 999;
box-sizing:border-box; box-sizing:border-box;
background-color: #FFFFFF;
.apptitle { .apptitle {
font-size: 18px; font-size: 18px;
font-weight: 800; font-weight: 800;

14
src/pages/improveData/improveData.vue
View File

@ -77,7 +77,7 @@
</u-form-item> --> </u-form-item> -->
<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 style="color: #99241B;">*</text>密码</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>
</view> </view>
@ -217,6 +217,14 @@
</view> </view>
<u-form-item ref="item1" @click="xieShow=true" class="data_itm">
<text class="label_t">*所属协会</text>
<u--input class="p32" placeholder="请选择所属协会" v-model="xieValue" readonly inputAlign="right"
border="none">
<u-icon slot="suffix" name="arrow-right"></u-icon>
</u--input>
</u-form-item>
<u-form-item ref="item1" @click="showJionmeet=true" class="data_itm" v-if="isJioned"> <u-form-item ref="item1" @click="showJionmeet=true" class="data_itm" v-if="isJioned">
<text class="label_t">入会时间</text> <text class="label_t">入会时间</text>
@ -384,7 +392,7 @@
renCaiShow: false, renCaiShow: false,
zhengzhiShow: false, zhengzhiShow: false,
zhengzhiValue: '', zhengzhiValue: '',
renCaiValue: ' ', renCaiValue: '',
zuValue: "汉族", zuValue: "汉族",
xieValue: '', xieValue: '',
zuShow: false, zuShow: false,
@ -395,7 +403,7 @@
honorList: [''], honorList: [''],
StandradList: [''], StandradList: [''],
peopleSkillColums: [ peopleSkillColums: [
["无", "乡镇人才", "县级人才", "乡镇人才", "市级人才", "省级人才", "国家级人才"] ["无", "乡镇人才", "县级人才", "市级人才", "省级人才", "国家级人才"]
], ],
Zucolumns: [ Zucolumns: [
["汉族", "朝鲜族"], ["汉族", "朝鲜族"],

6
src/pages/pageHome/pageHome.vue
View File

@ -651,12 +651,12 @@
.notice { .notice {
font-size: 24rpx; font-size: 24rpx;
color: #808DA1; color: #CCCCCC;
font-weight: 400; font-weight: 400;
line-height: 36RPX; line-height: 42rpx;
.phone { .phone {
color: #1492ff; color: #6C8BC7;
} }
} }
} }

8
src/pages/shop/Shop.vue
View File

@ -243,7 +243,12 @@
}, },
//选择一级类型 //选择一级类型
chooseOneType(item,index) { chooseOneType(item,index) {
this.type = item if(index == 0){
this.type = ''
}else{
this.type = item
this.getTypeE()
}
this.typeO = index this.typeO = index
this.fil = 0 this.fil = 0
this.typeT = 9999 this.typeT = 9999
@ -251,7 +256,6 @@
this.list2 = [] this.list2 = []
this.orderBy = '' this.orderBy = ''
this.pages = 1 this.pages = 1
this.getTypeE()
this.getData() this.getData()
}, },
//选择二级类型 //选择二级类型