| common/global.scss | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| manifest.json | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| mixin/mixin.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/home/components/home-top-flow.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/order/order-detail.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/user/supplier-user.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/customer/self/collect.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/customer/self/history.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/customer/shopping/confirm.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/customer/shopping/shopping.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/customer/trade/list.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| sub_pages/partner/delivery/delivery-home.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
common/global.scss
@@ -137,19 +137,38 @@ line-height: 78rpx; } } .component-button-contact{ background: none; border: none; box-sizing: 0px; outline: none; border-inline: none; // margin-top: 0px; display: flex; margin-left: 0rpx; margin-right: auto; flex: 1; padding-left: 0rpx; padding-right: 0rpx; line-height: 40rpx; } .component-button-contact::after{ display: none !important; } .component-stock-zero::after{ position: absolute; line-height: 100%; // font-size: ; left: 0rpx; right: 0rpx; // top: 0rpx; bottom: 0rpx; left: -2rpx; right: -2rpx; top: -2rpx; bottom: -2rpx; font-size: 600; content: '已售罄'; color: #fff; text-align: center; top: calc(50% - 20rpx); padding-top: calc(50% - 20rpx); background-color: #52525275; } .component-stock-zero{ position: relative; manifest.json
@@ -49,7 +49,7 @@ "quickapp" : {}, /* 快应用特有相关 */ "mp-weixin" : { "appid" : "wx1441324401626290", "appid" : "wx6d0ecc4e18710458", "setting" : { "urlCheck" : false, "es6" : true, mixin/mixin.js
@@ -78,6 +78,10 @@ this.regUserName = e.detail.value; // 获取微信昵称 }, handleContact(e) { console.log(e.detail.path) console.log(e.detail.query) }, @@ -142,12 +146,12 @@ //最好更新一下 idsMap[item.id] = { ...idsMap[item.id], ...item,//覆盖了 ...item, //覆盖了 } hasnew = true } } if(hasnew){ if (hasnew) { this.$forceUpdate() }
@@ -2,7 +2,7 @@ <view class="home-top-flow"> <view class="item flex" v-for="(item,index) of list" :key="index" @click="toDetail(item)"> <view class="img"> <image class="img img100" :class="[!item.stock?'component-stock-zero':'']" :src="item.cover"> <image class="img img100" :class="[!item.stock?'':'']" :src="item.cover"> </image> <view class="level"> {{ item.levelStr}} pages/order/order-detail.vue
@@ -325,9 +325,11 @@ {{ item.supplierName || ''}} </view> <view class="flex m-t-12"> <radio v-if="showSales" :checked="submitForm.orderItems.indexOf(item.id)>=0" @click="changeSalesOrderItem(item)"></radio> <radio v-if="showSales" :checked="submitForm.orderItems.indexOf(item.id)>=0" @click="changeSalesOrderItem(item)"></radio> <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)"> <image class="flower-img img100 br-4 m-r-6" :src="item.flowerCover" @click="previewImg(item.flowerCover)"> </image> <view class="flex1"> <view class=" flex"> @@ -338,9 +340,10 @@ <view class="each-list"> <view class="each-item"> <view class="label">货位号</view> <view class="value">{{ item.warehouseLocationCode || dto.warehouseLocationCode || '-' }}</view> <view class="value">{{ item.warehouseLocationCode || dto.warehouseLocationCode || '-' }} </view> </view> <view class="each-item"> <view class="label">颜色</view> <view class="value">{{ item.flowerColor || '-' }}</view> @@ -453,11 +456,15 @@ <image src="/static/common/icon-call.png" class="icon icon-call m-r-10 img100"></image> 拨打15974805814 </view> <view class="flex1 w-fit m-auto icon-view" open-type="contact"> <image src="/static/common/icon-wx.png" class="icon icon-call m-r-10 img100"></image> 点击联系在线客服 <view class="flex1 w-fit m-auto icon-view flex flex-wrap-normal" open-type="contact"> <image src="/static/common/icon-wx.png" class="icon icon-call m-t-2 m-r-10 img100"></image> <button open-type="contact" class="component-button-contact" @handleContact="handleContact"> 联系在线客服 </button> </view> </view> </view>
@@ -222,15 +222,20 @@ <view class="user-util m-t-12 " v-if="selftype==='supplier'||selftype==='customer' || !selftype"> <view class="title">我的客服</view> <view class="flex" open-type="contact"> <view class="flex flex-wrap-normal" > <image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image> <!-- @click="callTel" --> <view class="name"> 客服电话 : <span class="topic-gray">{{ tel }}</span> </view> <view class="right-icon" > <uni-icons type="right"></uni-icons> </view> <!-- @click="callTel" --> <button open-type="contact" class="component-button-contact" @handleContact="handleContact"> <view class="name"> 客服电话 : <span class="topic-gray">{{ tel }}</span> </view> <view class="right-icon" > <uni-icons type="right"></uni-icons> </view> </button> </view> </view> <!-- <view class="user-util m-t-12 " @click="callTel" v-if="selftype==='partner'"> sub_pages/customer/self/collect.vue
@@ -229,7 +229,7 @@ <view class="trade-list-container"> <view class="trade-info-container flex" :class="[dto.status!=='UP'?'OFF':'']" v-for="(dto,index) of list" :key="index"> <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'component-stock-zero':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image> <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image> <view class="flex1"> <view class="flex" @click.stop="toDetail(dto)"> <view class="title"> sub_pages/customer/self/history.vue
@@ -191,7 +191,7 @@ <view class="trade-list-container"> <view class="trade-info-container flex" :class="[dto.status!=='UP'?'OFF':'']" v-for="(dto,index) of list" :key="index"> <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'component-stock-zero':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image> <image class="img img100 br-4 m-r-10" :class="[!dto.stock?'':'']" :src="dto.url||dto.cover" @click.stop="toDetail(dto)"></image> <view class="flex1"> <view class="flex" @click.stop="toDetail(dto)"> <view class="title"> sub_pages/customer/shopping/confirm.vue
@@ -41,11 +41,24 @@ this.loadTransportList() this.cacheAddressId = this.address.id } // //先获取直接的全部地址 // @ApiModelProperty(value = "订单商品") // private List<FlowerCartListDTO> flowers; // @ApiModelProperty(value = "打包费") // private BigDecimal packing; if (this.currentInfo.customerDTO && this.currentInfo.customerDTO.partnerId) { this.$http.request('get', '/api/partner/page/view', { params: { id: this.currentInfo.customerDTO.partnerId } }).then(res => { if (res.code == 0) { this.partnerInfo = res.data || {} } }) } }, data() { @@ -65,6 +78,7 @@ need_columns: [ [] ], partnerInfo: {}, } }, @@ -126,7 +140,7 @@ } if (!this.address.id) { this.$message.showToast('请选择收货地址',{ this.$message.showToast('请选择收货地址', { duration: 2000 }) return @@ -234,6 +248,35 @@ </view> </view> </view> <view class="p10 bg-white m-t-20 br-4" v-if="partnerInfo&&partnerInfo.id"> <view class="form-item flex "> <view class="label">仓位名称</view> <view class="m-l-a m-r-0 flex desc-gray"> <view>{{partnerInfo.cityWarehouse|| '-'}}</view> </view> </view> <view class="form-item flex "> <view class="label">合伙人名称</view> <view class="m-l-a m-r-0 flex desc-gray"> <view>{{partnerInfo.name|| '-'}}</view> </view> </view> <view class="form-item flex "> <view class="label">联系方式</view> <view class="m-l-a m-r-0 flex desc-gray"> <view>{{partnerInfo.contactTel|| '-'}}</view> </view> </view> <view class="form-item flex "> <view class="label">提货地址</view> <view class="m-l-a m-r-0 flex desc-gray"> {{ partnerInfo['province'] || '' }}{{ partnerInfo['city'] && ('/' + partnerInfo['city']) || '' }}{{ partnerInfo['region'] && ('/' + partnerInfo['region']) || '' }}{{partnerInfo.address|| '-'}} </view> </view> </view> <!-- 查看商品列表，和选择运费 --> <view class="br-4 transform-container m-t-12 p10" v-if="!currentInfo.customerDTO||!currentInfo.customerDTO.partnerId"> @@ -267,13 +310,7 @@ <view class="p10 bg-white m-t-20 br-4"> <view class="form-item flex "> <view class="label">特殊需求</view> <!-- <view class="m-l-a m-r-0 flex1"> <view class="m-t-12 m-b-12"> <u-textarea v-model="dto.specialNeeds" placeholder="请输入特殊需求"> </u-textarea> </view> </view> --> <view class="m-l-a m-r-0 flex " :class="[!dto.specialNeeds?'desc-gray':'']" @click="()=>{ show_select_need=true }"> @@ -429,6 +466,7 @@ .transform-list { overflow-x: scroll; .transform-item { background: rgba(225, 240, 231, 0.38); border-radius: 8rpx; sub_pages/customer/shopping/shopping.vue
@@ -22,13 +22,13 @@ {{ item.supplierName || '-' }} </view> <u-divider></u-divider> <view v-for="(dto,j) of item.flowerList" :key="j"> <view v-for="(dto,j) of item.flowerList" :key="dto.id"> <u-divider v-if="j>0"></u-divider> <u-swipe-action> <u-swipe-action-item :options="options1" @click="(e)=>{clickSwipeButton(dto,true)}"> <view class="item-each flex"> <radio :checked="ids.indexOf(dto.id)>=0" @click="changeItem(dto,'flower')"></radio> <image class="img img100 m-r-6 br-4" :class="[!dto.stock?'component-stock-zero':'']" :src="dto.url||dto.cover"></image> <image class="img img100 m-r-6 br-4" :class="[!dto.stock?'component-stock-zero-tmp':'']" :src="dto.url||dto.cover"></image> <view class="flex1"> <view class="title" @click.stop="toDetail(dto)"><span class="m-r-5" style="display: inline-block;">{{dto.categoryStr||''}}</span><span @@ -168,8 +168,7 @@ async clickSwipeButton(item, check) { //删除商品，重新加载数据？ if (check) { this.$message.confirm('是否删除商品') return await this.$message.confirm('是否删除商品') }
@@ -59,7 +59,7 @@ <view class="component-shop-item flex" v-for="(item,index) of list" :key="index"> <view class="img" @click.stop="toDetail(item)"> <image class="img img100" :class="[!item.stock?'component-stock-zero':'']" :src="item.cover"> <image class="img img100" :class="[!item.stock?'component-stock-zero-tmp':'']" :src="item.cover"> </image> <view class="level"> {{item.levelStr||''}} sub_pages/partner/delivery/delivery-home.vue
@@ -53,10 +53,10 @@ <uni-icons type="right"></uni-icons> </view> </view> <view class="user-util m-t-12 " v-if="selftype==='supplier'||selftype==='customer' || !selftype"> <view class="title">我的客服</view> <view class="flex"> <!-- <view class="flex"> <image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image> <view class="name" @click="callTel"> 客服电话 : <span class="topic-gray">{{ tel }}</span> @@ -64,6 +64,19 @@ <view class="right-icon" open-type="contact"> <uni-icons type="right"></uni-icons> </view> </view> --> <view class="flex flex-wrap-normal"> <image class="icon-clock m-r-6 m-t-2" src="../../static/common/icon-call.png"></image> <!-- @click="callTel" --> <button open-type="contact" class="component-button-contact" @handleContact="handleContact"> <view class="name"> 客服电话 : <span class="topic-gray">{{ tel }}</span> </view> <view class="right-icon"> <uni-icons type="right"></uni-icons> </view> </button> </view> </view> </view>
