common/global.scss
@@ -54,6 +54,23 @@ color: #696969; } } .component-price-old{ text-decoration: line-through; } .component-price-new{ position: relative; .tip{ font-size: 22rpx; display: inline-block; margin-left: 10rpx; } .component-price-old{ position: absolute; left: 0rpx; top: 40rpx; } } .component-line-vert{ width: 2rpx; background-color: #EEEEEE; environments/index.js
@@ -1,7 +1,7 @@ export default { httpBaseUri: 'https://www.hmyxianhua.com/flower', // httpBaseUri: 'http://47.99.58.211/flower', // httpBaseUri: 'https://www.hmyxianhua.com/flower', httpBaseUri: 'http://47.99.58.211/flower', // httpBaseUri: 'http://localhost:8080/flower', clientId: '', secret: '', pages.json
@@ -327,13 +327,13 @@ "navigationBarTitleText": "供应商质检详情", "enablePullDownRefresh": true } }, { "path": "delivery/delivery-supplier-detail-list", "style": { "navigationBarTitleText": "供应商质检详情", "enablePullDownRefresh": true } }, { "path": "delivery/delivery-supplier-detail-list", "style": { "navigationBarTitleText": "供应商质检详情", "enablePullDownRefresh": true } }, { "path": "delivery/delivery-home", @@ -473,13 +473,18 @@ "navigationStyle": "custom", "enablePullDownRefresh": false } }, { "path" : "coupon/good-detail", "style" : { "navigationBarTitleText" : "详情" } }, { "path": "coupon/good-detail", "style": { "navigationBarTitleText": "详情" } }, { "path": "self/member-center", "style": { "navigationBarTitleText": "会员中心" } } // #endif ] pages/home/components/home-top-flow.vue
@@ -13,9 +13,20 @@ <view class="title"> {{ item.name || '-' }} <!-- <span v-if="item.categoryStr" class="m-l-10">{{item.categoryStr || '-'}}</span> --> <!-- #ifdef PUB_CUSTOMER_DEV --> <view class="price component-price-new"> ￥{{item.priceMember||item.price}}/扎<span class="tip">会员价</span> <view class="component-price-old"> ￥{{item.price}}/扎 </view> </view> <!-- #endif --> <!-- #ifndef PUB_CUSTOMER_DEV --> <view class="price"> ￥{{ item.price || 0 }}/扎 </view> <!-- #endif --> </view> <view class="tags" v-if="item.tags"> <view class="tag red" v-for="(tag,k) of item.tagArr" :class="[k===0?'red':'green']" :key="tag">{{ @@ -64,7 +75,11 @@ this.page.current = 1 this.getList('post') }, methods: { fun_GetMore(){ this.getMore('post') }, getList_after() { if (this.list) { for (var item of this.list) { pages/home/home.vue
@@ -69,7 +69,7 @@ <!-- 几个专区 --> <home-zones></home-zones> <!-- 置顶的花列表 --> <home-top-flow></home-top-flow> <home-top-flow ref="home_top_flow"></home-top-flow> <view style="min-height:140rpx"> </view> @@ -188,7 +188,13 @@ path: url, } }, onReachBottom() { console.log('onReachBottom') if(this.$refs&&this.$refs.home_top_flow){ // console.log(this.$refs.home_top_flow) this.$refs.home_top_flow.fun_GetMore() } }, onLoad(options) { // if(options.partnerUserId){ // //需要前往注册了 pages/user/supplier-user.vue
@@ -39,6 +39,40 @@ ({{ currentInfo.supplierDTO ? currentInfo.supplierDTO.statusStr : '' }})</span> <span v-if="currentInfo.partnerDTO&¤tInfo.partnerDTO.status!=='P'"> ({{ currentInfo.partnerDTO ? currentInfo.partnerDTO.statusStr : '' }})</span> <!-- #ifdef PUB_CUSTOMER_DEV --> <span class="member-level" @click="goto('/sub_pages/customer/self/member-center',true)" v-if="currentInfo&¤tInfo.customerDTO&¤tInfo.customerDTO.userGrowthRecord"> <view v-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='普通会员'"> <image class="member-icon v1" src="../../static/images/customer/coupon/member/icon-member-1.png"></image> {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}} <uni-icons color="#79C57B" type="right" size="18"></uni-icons> </view> <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='银卡会员'"> <image class="member-icon v2" src="../../static/images/customer/coupon/member/icon-member-2.png"></image> {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}} <uni-icons color="#96B1E9" type="right" size="18"></uni-icons> </view> <view v-else-if="currentInfo.customerDTO.userGrowthRecord.currentMemberLevel=='金卡会员'"> <image class="member-icon v3" src="../../static/images/customer/coupon/member/icon-member-3.png"></image> {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}} <uni-icons color="#AD790F" type="right" size="18"></uni-icons> </view> <view v-else> <image class="member-icon v4" src="../../static/images/customer/coupon/member/icon-member-3.png"></image> {{currentInfo.customerDTO.userGrowthRecord.currentMemberLevel}} <uni-icons color="#E4531C" type="right" size="18"></uni-icons> </view> </span> <!-- #endif --> </view> <view class="t2">{{ currentInfo.tel || '暂无电话' }}</view> </view> @@ -73,7 +107,22 @@ </view> <!-- #ifdef PUB_CUSTOMER_DEV --> <view class="user-utils m-20 coupon-info-container" @click="goto( `/sub_pages/customer/coupon/good-all`,true)" v-if="selftype==='customer'||!selftype"> <view> <view class="title">积分商城</view> <view class="score m-t-8">拥有积分：{{currentInfo.currentPoint || 0}}</view> </view> <view class="button m-l-a m-r-0 m-t-12"> 去兑换 <uni-icons color="#ffffff" type="right" size="16"></uni-icons> </view> </view> <!-- #endif --> <!-- #ifdef PUB_CUSTOMER --> <view class="user-utils m-20 user-customer-order-infos" v-if="selftype==='customer'||!selftype"> <view class="user-util m-t-12"> <view class="title flex"> @@ -82,12 +131,6 @@ <uni-icons class="" type="right" size="12"></uni-icons> </view> </view> <view class="flex order-icons-container"> <view class="order-icons" style="position: relative;" @@ -188,15 +231,15 @@ </image> <view>兑换券</view> </view> <!-- #endif --> <!-- #ifndef PUB_CUSTOMER_DEV --> <view class="service-icons" > </view> <view class="service-icons" > </view> <!-- #endif --> <!-- #ifndef PUB_CUSTOMER_DEV --> <view class="service-icons"> </view> <view class="service-icons"> </view> <!-- #endif --> </view> </view> pages/user/user-customer.scss
@@ -1,5 +1,70 @@ .member-level{ font-weight: 600; font-size: 32rpx; color: #A3EBCD; line-height: 44rpx; text-align: left; font-style: normal; display: inline-block; margin-left: 18rpx; // background: linear-gradient(90deg, #75D982 0%, #54A953 100%); .member-icon{ display: inline-block; vertical-align: bottom; width: 48rpx; height: 56rpx; background-size: 100% 100%; } } .member-level.v1{ color: #A3EBCD; } .member-level.v2{ color: #96B1E9; } .member-level.v3{ color: #AD790F; } .member-level.v4{ color: #E4531C; } .coupon-info-container{ display: flex; // width: 690rpx; padding: 22rpx 36rpx; // height: 134rpx; background: linear-gradient( 180deg, #FBECC1 0%, #E6CE9E 100%); border-radius: 8rpx; border: 2rpx solid; border-image: linear-gradient(180deg, rgba(238, 217, 173, 1), rgba(219, 182, 105, 1)) 2 2; .title{ font-weight: 600; font-size: 36rpx; color: #AD790F; line-height: 50rpx; } .score{ font-weight: 400; font-size: 28rpx; color: #AD790F; line-height: 40rpx; } .button{ width: 170rpx; height: 58rpx; background: linear-gradient( 184deg, #ECCA6D 0%, #D59A3B 100%); border-radius: 30rpx; line-height: 58rpx; text-align: center; font-weight: 600; font-size: 28rpx; color: #FFFFFF } } .user-customer-order-infos{ padding-top: 0rpx; .image-shop-number { width: 30rpx; height: 30rpx; static/images/customer/coupon/member/icon-member-1.png
@@ -6,7 +6,7 @@ mode="scaleToFill" /> <view class="title"> <uni-icons class="icon" type="left" size="24" @click="backpage"></uni-icons> <uni-icons class="icon" type="left" size="24" @click="backpage()"></uni-icons> 积分兑换 </view> <view class="flex point-info"> @@ -19,7 +19,7 @@ <uni-icons class="icon" type="right" size="32"></uni-icons> </view> </view> <view class="m-l-a m-r-0 rule"> <view class="m-l-a m-r-0 rule" @click="goto('/pages/help/content?id=积分规则',false)"> <view class="flex w-fit m-l-a m-r-15"> <view class="m-r-10">规则</view> <image src="../../../static/images/customer/coupon/icon-rule.png" class="rule-icon"> sub_pages/customer/coupon/good-self.vue
@@ -30,8 +30,8 @@ </view> </view> </view> <view style="min-height: 130rpx;"></view> <view class="bottom-button" @click="toGoodAll">前往兑换</view> <!-- <view style="min-height: 130rpx;"></view> --> <!-- <view class="bottom-button" @click="toGoodAll">前往兑换</view> --> </view> </template>
@@ -239,18 +239,32 @@ <view class="flex1"> <view class="flex" @click.stop="toDetail(dto)"> <view class="title"> <span class="m-r-5" style="display: inline-block;" v-if="dto.categoryStr">{{dto.categoryStr||''}}</span> <!-- <span class="m-r-5" style="display: inline-block;" --> <!-- v-if="dto.categoryStr">{{dto.categoryStr||''}}</span> --> <span v-if="dto.levelStr" class="m-r-5" style="display: inline-block;">{{ dto.levelStr || '' }}</span> {{ dto.name || '-' }} </view> <!-- #ifdef PUB_CUSTOMER_DEV --> <view class="price m-l-a m-r-0 component-price-new"> ￥{{ dto.priceMember || dto.price || '-' }}/扎<span class="tip">会员价</span> <view class="component-price-old"> ￥{{dto.price}}/扎 </view> </view> <!-- #endif --> <!-- #ifndef PUB_CUSTOMER_DEV --> <view class="price m-l-a m-r-0"> ￥{{ dto.price || '-' }}/扎 </view> <!-- #endif --> </view> <view class="flex"> <view class="desc p-t-12 flex" @click.stop="toDetail(dto)"> <view class="m-r-15">已售:{{ ((dto.sales||0) +(dto.realSales||0)) || 0 }}</view> <view class="m-r-15">剩余:{{ dto.stock || 0 }}</view> <view class="m-r-15">颜色:{{ dto.color || '-' }}</view> </view> sub_pages/customer/self/history.vue
@@ -227,18 +227,31 @@ <view class="flex1"> <view class="flex" @click.stop="toDetail(dto)"> <view class="title"> <span class="m-r-5" style="display: inline-block;" v-if="dto.categoryStr">{{dto.categoryStr||''}}</span> <!-- <span class="m-r-5" style="display: inline-block;" --> <!-- v-if="dto.categoryStr">{{dto.categoryStr||''}}</span> --> <span v-if="dto.levelStr" class="m-r-5" style="display: inline-block;">{{ dto.levelStr || '' }}</span> {{ dto.name || '-' }} </view> <!-- #ifdef PUB_CUSTOMER_DEV --> <view class="price m-l-a m-r-0 component-price-new"> ￥{{ dto.priceMember || dto.price || '-' }}/扎<span class="tip">会员价</span> <view class="component-price-old"> ￥{{dto.price}}/扎 </view> </view> <!-- #endif --> <!-- #ifndef PUB_CUSTOMER_DEV --> <view class="price m-l-a m-r-0"> ￥{{ dto.price || '-' }}/扎 </view> <!-- #endif --> </view> <view class="flex"> <view class="desc p-t-12 flex" @click.stop="toDetail(dto)"> <view class="m-r-15"> 已售:{{ ((dto.sales||0) +(dto.realSales||0)) || 0 }} </view> <view class="m-r-15">剩余:{{ dto.stock || 0 }}</view> <view class="m-r-15">颜色:{{ dto.color || '-' }}</view> </view> sub_pages/customer/self/member-center.vue
对比新文件 @@ -0,0 +1,22 @@ <template> <view> </view> </template> <script> export default { data() { return { } }, methods: { } } </script> <style> </style> sub_pages/customer/shop/shop.vue
@@ -34,17 +34,17 @@ <view class="label">发布</view> </view> <view class="form-item"> <view class="value">0</view> <view class="value">*</view> <view class="label">获赞</view> </view> <view class="form-item"> <view class="value">0</view> <view class="value">*</view> <view class="label">粉丝</view> </view> <view class="form-item"> <!-- <view class="form-item"> <view class="value">0</view> <view class="label">关注</view> </view> </view> --> </view> <view class="p10" style="padding-left: 20rpx;padding-right: 20rpx;"> <top-tabs :tabs="tabs" :flg="flg" @change="changeTab"> @@ -105,9 +105,20 @@ <view class="m-l-12 info-container flex1"> <view class="title" @click.stop="toDetail(item)"> {{item.name}} <!-- #ifdef PUB_CUSTOMER_DEV --> <view class="price component-price-new"> ￥{{item.priceMember||item.price}}/扎<span class="tip">会员价</span> <view class="component-price-old"> ￥{{item.price}}/扎 </view> </view> <!-- #endif --> <!-- #ifndef PUB_CUSTOMER_DEV --> <view class="price"> ￥{{item.price}}/扎 </view> <!-- #endif --> </view> <view class="tags" v-if="item.tags||false" @click.stop="toDetail(item)"> <!-- <view class="tag red">限时抢购</view> @@ -573,15 +584,15 @@ display: flex; .tag { // min-width: 60rpx; padding-left: 10rpx; padding-right: 10rpx; line-height: 30rpx; background: #FEE6E6; border-radius: 10rpx; font-size: 18rpx; color: #CD1212; margin-right: 6rpx; // min-width: 60rpx; padding-left: 10rpx; padding-right: 10rpx; line-height: 30rpx; background: #FEE6E6; border-radius: 10rpx; font-size: 18rpx; color: #CD1212; margin-right: 6rpx; text-align: center; }
@@ -385,7 +385,7 @@ <view class="bottom-price flex"> <view class="m-t-12 m-l-0 m-r-a"> 合计 <span class="t-red">￥ {{ (dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) || 0 }} </span>元 {{ ((dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) || 0).toFixed(2) }} </span>元 </view> <view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitOrder"> 提交订单 sub_pages/customer/shopping/shopping.vue
@@ -38,7 +38,7 @@ style="display: inline-block;">{{ dto.levelStr || '' }}</span>{{ dto.name || '-' }} </view> <view class="price" @click.stop="toDetail(dto)"> {{ dto.price || '-' }}元/扎 {{ dto.priceMember || dto.price || '-' }}元/扎 </view> <view class="flex"> <view class="desc flex p-t-5" @click.stop="toDetail(dto)"> @@ -120,7 +120,7 @@ this.list && this.list.forEach(dto => { dto.flowerList && dto.flowerList.forEach(item => { if (this.ids.indexOf(item.id) >= 0) { totalprice += item.price * item.num totalprice += (item.priceMember || item.price || 0) * item.num } }) }) sub_pages/customer/trade/detail.vue
@@ -71,11 +71,27 @@ <view class="m-r-15">剩余:{{ dto.stock || 0 }}</view> <view class=" ">{{ dto.unit || '-' }}</view> </view> <view class="flex m-t-12"> <view class="price m-r-a"> <span class="num">{{ dto.price || '-' }}</span> 元/扎 </view> <view class="flex m-t-12"> <!-- #ifdef PUB_CUSTOMER_DEV --> <view> <view class="price m-r-a component-price-new"> <span class="num">{{ dto.priceMember || dto.price || '-' }}</span> 元/扎<span class="tip">会员价</span> </view> <view class="price m-r-a component-price-old"> <span class="num">{{ dto.price || '-' }}</span> 元/扎 </view> </view> <!-- #endif --> <!-- #ifndef PUB_CUSTOMER_DEV --> <view class="price m-r-a"> <span class="num">{{ dto.price || '-' }}</span> 元/扎 </view> <!-- #endif --> <view class="m-l-a m-r-15"> <button open-type="contact" class="component-button-contact"> <image src="../../../static/common/icon-kf.png" class="icon-kf m-l-15 img100"></image> sub_pages/customer/trade/list.vue
@@ -73,9 +73,21 @@ <view @click.stop="toDetail(item)"> <view class="title"> {{item.name||'-'}} <view class="price"> ￥{{item.price||0}}元/扎 </view> <!-- #ifdef PUB_CUSTOMER_DEV --> <view class="price component-price-new"> ￥{{item.priceMember||item.price}}/扎<span class="tip">会员价</span> <view class="component-price-old"> ￥{{item.price}}/扎 </view> </view> <!-- #endif --> <!-- #ifndef PUB_CUSTOMER_DEV --> <view class="price"> ￥{{item.price||0}}元/扎 </view> <!-- #endif --> </view> <view class="tags" v-if="item.tags"> <!-- <view class="tag red">限时抢购</view> sub_pages/customer/trade/trade.vue
@@ -54,8 +54,19 @@ </image> </view> <view class="cateen_infos list"> <view class="title">{{item.name}}</view> <view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view> <view class="title">{{item.name}}</view> <!-- #ifdef PUB_CUSTOMER_DEV --> <view class="price"> <view>会员价</view> <view>￥{{item.priceLowMember || 0}}-{{item.priceHighMember||0}}</view> </view> <view class="price component-price-old">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view> <!-- #endif --> <!-- #ifndef PUB_CUSTOMER_DEV --> <view class="price">￥{{item.priceLow || 0}}-{{item.priceHigh||0}}</view> <!-- #endif --> <view class="desc">在售 {{item.stock||'0'}} 扎</view> </view>
