Skip to content

7
7-Eleven
Commit df784535 by 谢中龙
Options

优化功能

parent 91508d2b
Showing with 681 additions and 42 deletions
src/app.json
......@@ -96,6 +96,12 @@
"pages/couponWriteOff/couponWriteOff",
"pages/openCard/openCard"
]
},
{
"root": "subPackageA/page",
"pages": [
"pages/deliveryCode/deliveryCode"
]
}
],
"usingComponents": {
......@@ -122,6 +128,10 @@
"contactPlugin": {
"version": "1.3.0",
"provider": "wx104a1a20c3f81ec2"
},
"live-player-plugin": {
"version": "1.0.2",
"provider": "wx2b03c6e691cd7370"
}
},
"permission": {
......@@ -130,4 +140,4 @@
}
},
"sitemapLocation": "sitemap81.json"
}
}
\ No newline at end of file
src/config/index.js
......@@ -6,7 +6,7 @@
// 修改 BRANCH_ID 为对应的商户id
// app.js 中brandId 修改为对应
const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
const PROJECT_ENV = 'prod' // 生产 prod, 开发 dev, 测试 test , 测试门户 test_store, 预生产 pre
//仅生产环境时 配置 ：
//3001 3001 , wx313ec36b710125d4
//2006 泰华 , wx40fec8944623c8b3
......@@ -21,7 +21,7 @@ const PROJECT_ENV = 'test' // 生产 prod, 开发 dev, 测试 test , 测试门
//2015 花在花园
//2016 阿吉豆
//2017 ACTREE wx2aae34874e88cdf5
const BRANCH_ID = 1002
const BRANCH_ID = 3001
const isMall = true
// const needMock = '' //
......
src/pages/confirmOrder/confirmOrder.js
......@@ -742,7 +742,11 @@ wxService.page({
});
},
fail(res) {
wx.hideLoading()
wx.hideLoading();
wx.showToast({
title: '支付已取消',
icon : 'none'
});
if (_this.data.currentType == 'delivery') {
wx.redirectTo({
url: '/pages/order/order',
......@@ -750,7 +754,7 @@ wxService.page({
}
else {
wx.redirectTo({
url: '/oneSubPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList',
url: '/subPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList',
});
}
}
......
src/pages/productDetail/productDetail.js
......@@ -35,7 +35,9 @@ wxService.page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log('productInfo----options-----', options)
if (options && options.id) {
this.data.productId = options.id;
this.setData({
productId: options.id,
fromZc: options.fromZc == 1
......@@ -71,14 +73,12 @@ wxService.page({
}
this.generatePointObject(tentacleInfo);
}
}).finally(() => {
wx.hideLoading()
})
}
},
swiperChange(e) {
......@@ -151,7 +151,11 @@ wxService.page({
* 生命周期函数--监听页面显示
*/
onShow: function () {
const { memberId, member } = wx.getStorageSync('_baseUserInfo')
const { memberId, member } = wx.getStorageSync('_baseUserInfo');
if (!this.data.productId){
this.data.productId = this.options.id;
}
this.getProInfo()
this.getOpenStatus()
this.data.currentShareContent = null
......@@ -168,7 +172,6 @@ wxService.page({
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
// data.descHtml = '<p><span style="color: rgb(230, 0, 0);" class="ql-size-large">这个是商品详情图文介绍</span></p><p><br></p><p><img src="https://img3.bigaka.com/test/1001/201912/20191226/10013c605d74-1098-4adb-a6ad-5b2397f9dc9a.png"></p><p><img src="https://img3.bigaka.com/test/1001/201912/20191226/100119d81a35-a821-45dd-a09a-caa04fe79e01.png"></p><p><img src="https://img3.bigaka.com/test/1001/201912/20191226/1001e793d3f6-a7f4-4523-bc42-0df5e3fc822b.png"></p>';
data.type = 'share';
this.setData({
productInfo: data
......
src/pages/productDetail/productDetail.wxml
......@@ -39,11 +39,11 @@
open-type='getUserInfo'
hover-class="btn-hover"
>
<image class="share-img" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001843570f0-4ff8-4e72-8d69-9710269420bf.png" />
<image class="share-img" src="/assets/imgs/7_1_0/08_22/share.png" />
<text class="share-text">分享</text>
</button>
<view wx:if="{{currentHasUserInfo}}" class="share-wrap" bindtap="onTapShare">
<image class="share-img" src="https://img3.bigaka.com/prd/3001/202003/20200309/3001843570f0-4ff8-4e72-8d69-9710269420bf.png" />
<image class="share-img" src="/assets/imgs/7_1_0/08_22/share.png" />
<text class="share-text">分享</text>
</view>
</view>
......
src/pages/refund/refund.wxml
......@@ -4,13 +4,12 @@
<view class="cart-content">
<view class="cart-item" wx:for="{{cartList}}" wx:key="{{index}}">
<view class="cart-list" style="{{item.shows}}" data-index="{{index}}">
<view class="select-radio" catchtap="selectPro" data-index="{{index}}">
<view class="select-radio" bindtap="checkPro" data-index="{{index}}">
<icon
size="16"
size="18"
type="{{item.checked ? 'success' : 'circle'}}"
color="{{checkedColor}}"
data-index="{{index}}"
catchtap="checkPro"
/>
</view>
<view class="pro-info">
......@@ -30,6 +29,7 @@
data-index="{{index}}"
bindblur="blurNum"
value="{{item.count}}"
disabled="true"
/>
<button class="add-num" data-index="{{index}}" catchtap="addNum">+</button>
</view>
......
src/pages/refund/refund.wxss
......@@ -20,6 +20,13 @@ page{
flex-shrink: 0;
}
.select-radio{
height: 180rpx;
display: flex;
justify-content: center;
align-items: center;
}
.pro-img{
width: 180rpx;
height: 180rpx;
......@@ -66,7 +73,7 @@ page{
padding: 4rpx;
width: 80rpx;
height: 40rpx;
line-height: 40rpx;
line-height: 33rpx;
color: #868686;
font-size: 28rpx;
background-color: #ffffff;
......
src/pages/userCenter/userCenter.js
......@@ -394,6 +394,8 @@ wxService.page({
let m = Integer.digit(memberId, 10, 64);
path = `pages/userCenter/userCenter?m=${m}`;
}
console.log(path)
return {
title: envInfo.shareTitle,
path: path
......
src/project.config.json
......@@ -13,7 +13,7 @@
},
"compileType": "miniprogram",
"libVersion": "2.8.2",
"appid": "wxac09792264c49b5c",
"appid": "wx313ec36b710125d4",
"projectname": "%E5%BE%AE%E5%95%86%E5%9F%8E",
"debugOptions": {
"hidedInDevtools": []
......@@ -148,7 +148,7 @@
"id": 16,
"name": "商品详情页",
"pathName": "pages/productDetail/productDetail",
"query": "id=634719195157905408",
"query": "i=c72c(omX00&t=c8Yp1GGc00",
"scene": null
},
{
......@@ -482,13 +482,14 @@
"id": 65,
"name": "超值卡列表",
"pathName": "subPackage/page/pages/valueCard/valueCard",
"query": "scene=t%3Dc76v7VGX00"
"query": "scene=t%3Dc9bCCU1100",
"scene": null
},
{
"id": 71,
"id": 66,
"name": "超值卡详情",
"pathName": "subPackage/page/pages/valueCardInfo/valueCardInfo",
"query": "id=674573141175046144",
"query": "id=681486237038809088",
"scene": null
},
{
......@@ -528,7 +529,7 @@
"id": 72,
"name": "自提订单详情",
"pathName": "subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo",
"query": "id=676422376522780672",
"query": "id=686957183723900928",
"scene": null
},
{
......@@ -549,7 +550,7 @@
"id": 75,
"name": "直播入口",
"pathName": "subPackage/page/pages/liveVideo/liveVideo",
"query": "room_id=2",
"query": "room_id= 7",
"scene": null
},
{
......@@ -565,6 +566,13 @@
"pathName": "subPackage/page/pages/couponCenterInfo/couponCenterInfo",
"query": "",
"scene": null
},
{
"id": 78,
"name": "自提订单展示取货码",
"pathName": "subPackageA/page/pages/deliveryCode/deliveryCode",
"query": "id=686957183723900928",
"scene": null
}
]
}
......
src/shoppingGuid/page/pages/achievement/achievement.js
......@@ -82,6 +82,7 @@ wxService.page({
onLoad: function (options) {
wx.hideShareMenu();
let currentUserInfo = wx.getStorageSync('guidBaseInfo');
console.log('_baseUserInfo---',wx.getStorageSync('_baseUserInfo'))
if (!currentUserInfo) { //未登录成功
wx.redirectTo({
url: '/shoppingGuid/page/pages/welcomGuider/welcomGuider',
......
src/shoppingGuid/page/pages/guidCollegeInfo/guidCollegeInfo.js
......@@ -13,7 +13,7 @@ wxService.page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
wx.hideShareMenu();
// wx.hideShareMenu();
let id = options.id;
this.getCollegeInfo(id);
},
......
src/shoppingGuid/page/pages/home/home.js
......@@ -79,9 +79,25 @@ wxService.page({
wx.scanCode({
success : res => {
let result = res.result;
wx.navigateTo({
url: '/shoppingGuid/page/pages/couponWriteOff/couponWriteOff?id=' + result,
});
if(result){
let arr = result.split('_');
if(arr.length == 1){
//处理扫码优惠券的时候
wx.navigateTo({
url: '/shoppingGuid/page/pages/couponWriteOff/couponWriteOff?id=' + result,
});
}
else{
//处理带类型参数的
let id = arr[0] , type = arr[1];
//1 自提订单确认收货详情
if(type == 1){
wx.navigateTo({
url: '/subPackageA/page/pages/deliveryCode/deliveryCode?id=' + id,
});
}
}
}
},
fail : err => {
console.log('扫码失败结果是--',err)
......
src/shoppingGuid/page/pages/welcomGuider/welcomGuider.js
......@@ -47,6 +47,7 @@ wxService.page({
});
},
fail : res => { //失效了
wx.removeStorageSync('guidBaseInfo');
console.log('check session fail , starting login ----')
this.qyLogin();
}
......
src/subPackage/page/pages/couponCenter/couponCenter.js
......@@ -73,7 +73,7 @@ wxService.page({
//跳转到详情
goCouponDetail(e) {
const { id } = e.currentTarget.dataset
wxService.router(`/oneSubPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${id}`)
wxService.router(`/subPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${id}`)
},
/**
* 页面相关事件处理函数--监听用户下拉动作
......
src/subPackage/page/pages/couponCenterInfo/couponCenterInfo.js
......@@ -76,7 +76,7 @@ wxService.page({
let url = this.data.activityInfo.listPicture ? this.data.activityInfo.listPicture : 'https://bigaka-xie.oss-cn-shanghai.aliyuncs.com/icon_get_coupon.png';
return {
title: `我分享给你一张“${this.data.activityInfo.couponName}”的优惠券，赶快领取吧~`,
path: `/oneSubPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${this.data.activityId}`,
path: `/subPackage/page/pages/couponCenterInfo/couponCenterInfo?id=${this.data.activityId}`,
imageUrl: url, // 可以更换分享的图片
}
}
......
src/subPackage/page/pages/liveVideo/liveVideo.js
......@@ -39,6 +39,6 @@ wxService.page({
// 直播开通需要 配置plugin ：
// "live-player-plugin": {
// "version": "1.0.0",
// "version": "1.0.2",
// "provider": "wx2b03c6e691cd7370"
// }
\ No newline at end of file
src/subPackage/page/pages/myValueCard/myValueCard.wxml
......@@ -17,9 +17,11 @@
mode='widthFix'></image>
<!-- 过期时间展示 -->
<!-- <view class='top-left-days'><label>剩{{item.leftTimes}}天</label></view> -->
<view class="left-days">
<label wx:if="{{item.useResidueDays > 0}}">剩余{{item.leftTimes}}次/{{item.useResidueDays}}天后过期</label>
</view>
<view class='card-top-info-desc'>
<text wx:if="{{item.useResidueDays <= 0}}"></text>
<label wx:if="{{item.useResidueDays > 0}}">剩{{item.leftTimes}}次，{{item.useResidueDays}}天过期</label>
<text ></text>
<image class='qrcode'
src='https://img3.bigaka.com/prd/3001/202003/20200309/3001b0c7b943-a805-4550-a179-8b963913b513.png' mode='aspectFit'></image>
</view>
......
src/subPackage/page/pages/myValueCard/myValueCard.wxss
......@@ -56,6 +56,8 @@ view{
align-items: center;
}
.my-value-card-list .my-value-card-item .card-top-info{
width: 100%;
height: auto;
......@@ -73,6 +75,31 @@ view{
align-items: center;
}
.left-days{
position: absolute;
top: 20rpx;
width: 100%;
height: 70rpx;
padding: 0 30rpx;
display: flex;
justify-content: flex-end;
align-items: center;
}
.left-days label{
height: 50rpx;
width: auto;
padding: 0 30rpx;
border-radius: 25rpx;
background: #ffffff;
color: #333333;
font-weight: bold;
font-size: 24rpx;
display: flex;
align-items: center;
justify-content: center;
}
.my-value-card-list .my-value-card-item .card-top-info .top-left-days label{
height: 50rpx;
width: auto;
......
src/subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml
<!--subPackage/page/pages/myValueCardInfo/myValueCardInfo.wxml-->
<view class='my-card-info'>
<image src='{{valueCardInfo.backGroundUrl}}' mode='widthFix'></image>
<label>剩{{valueCardInfo.leftTimes}}次，{{valueCardInfo.useResidueDays}}天过期</label>
<label>剩余{{valueCardInfo.leftTimes}}次/{{valueCardInfo.useResidueDays}}天后过期</label>
</view>
<view class='left-num-container'>
......
src/subPackage/page/pages/paymentStatus/paymentStatus.js
......@@ -99,7 +99,7 @@ wxService.page({
goOrder() {
if(this.data.type == 'selfPickUp'){
wx.redirectTo({
url: '/oneSubPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList',
url: '/subPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList',
});
}
else{
......
src/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.js
// subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.js
const app = getApp();
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util')
const utils = require('../../../../utils/util');
var wxbarcode = require('../../../../codeUtils/index.js');
const orderStatusTextObj = {
N : '待付款',
P : '待自提',
......@@ -24,6 +27,11 @@ wxService.page({
onLoad: function (options) {
wx.hideShareMenu();
this.data.id = options.id;
this.setData({
id: this.data.id
},() => {
this.generateBarCode();
});
this.getOrderInfo();
},
//获取订单详情
......@@ -51,7 +59,7 @@ wxService.page({
data.latitude = '';
data.longitude = '';
if(store){
let addressArr = store.addressArea.split(',');
let addressArr = store.addressArea ? store.addressArea.split(',') : [];
addressArr.push(store.addressDetail);
data.storeAddress = addressArr.join('');
data.latitude = store.latitude;
......@@ -80,6 +88,17 @@ wxService.page({
}
})
},
//生成条形码
generateBarCode() {
let id = this.data.id + '_1';
wxbarcode.barcode('barcode', id, 640, 140);
setTimeout(() => {
wxbarcode.barcode('barcode', id, 640, 140);
}, 200);
},
canvasIdErrorCallback(e) {
console.log('code-me', e.detail.errMsg)
},
copy(e) {
wx.setClipboardData({
//准备复制的数据
......@@ -205,11 +224,11 @@ wxService.page({
title: '加载中',
mask: true
})
wxService.post(`/sale/trade/buyer/confirm/${id}`).then(res => {
wxService.post(`/sale/trade/seller/selfconfirm/${id}`).then(res => {
wx.hideLoading()
if (res) {
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
wx.showToast({
title: `您已确认收货!`,
icon: 'none'
......
src/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxml
......@@ -11,6 +11,15 @@
<view class="store-address">{{orderInfo.storeAddress}}</view>
</view>
<!-- 展示取货码 -->
<view class="get-code" wx:if="{{orderInfo.status == 'P'}}">
<view class="my-deliver-title">我的取货码</view>
<view class="my-code">
<canvas canvas-id="barcode" binderror="canvasIdErrorCallback" />
<label>{{id}}</label>
</view>
</view>
<!-- 订单商品 -->
<view class="order-goods">
<view class="order-status">
......
src/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxss
......@@ -4,15 +4,52 @@ page{
box-sizing: border-box;
-webkit-box-sizing: border-box;
padding: 20rpx;
padding-bottom: 102rpx;
padding-bottom: 110rpx;
}
view{
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.get-code{
width: 100%;
height: auto;
padding: 30rpx;
background: #ffffff;
margin-bottom: 20rpx;
}
.get-code .my-deliver-title{
font-size: 24rpx;
color: #333333;
font-weight: 550;
margin-bottom: 20rpx;
display: flex;
justify-content: center;
}
.get-code .my-code{
width: 100%;
height: auto;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.get-code .my-code canvas{
width: 640rpx;
height: 140rpx;
margin-bottom: 10rpx;
}
.get-code .my-code label{
letter-spacing: 2rpx;
font-size: 28rpx;
color: #666666;
}
.order-info-store{
width: 100%;
height: auto;
......
src/subPackage/page/pages/selfPickUpOrderList/selfPickUpOrderList.js
......@@ -78,7 +78,7 @@ wxService.page({
onTapToOrderInfo(e){
let item = e.currentTarget.dataset.item;
wx.navigateTo({
url: '/oneSubPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo?id=' + item.id,
url: '/subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo?id=' + item.id,
});
},
//立即支付
......
src/subPackageA/page/pages/deliveryCode/deliveryCode.js 0 → 100644
// subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.js
const app = getApp();
const wxService = require('../../../../utils/wxService')
const utils = require('../../../../utils/util');
var wxbarcode = require('../../../../codeUtils/index.js');
const orderStatusTextObj = {
N: '待付款',
P: '待自提',
R: '已完成',
C: '已取消',
RE: '已退款'
}
wxService.page({
/**
* 页面的初始数据
*/
data: {
id: null,
orderInfo: {}
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
wx.hideShareMenu();
this.data.id = options.id;
this.getOrderInfo();
},
//获取订单详情
getOrderInfo() {
wx.showLoading({
title: '加载中',
mask: true
});
wxService.get(`/sale/trade/buyer/${this.data.id}`).then(res => {
if (res) {
const { result, data } = res.data
if (result == 0) {
wx.hideLoading()
let skuVOList = data.skuVOList ? data.skuVOList : [];
let sum = 0;
skuVOList.forEach(item => {
item.refundCount = item.refundCount ? item.refundCount : 0;
item.canRefundNum = (item.count - item.refundCount) >= 0 ? (item.count - item.refundCount) : 0;
sum = sum + item.price * item.count;
});
data.orderStatusText = orderStatusTextObj[data.status];
let store = data.store ? data.store : null;
data.storeAddress = '暂无地址';
data.latitude = '';
data.longitude = '';
if (store) {
let addressArr = store.addressArea ? store.addressArea.split(',') : [];
addressArr.push(store.addressDetail);
data.storeAddress = addressArr.join('');
data.latitude = store.latitude;
data.longitude = store.longitude;
}
//处理能不能退款
let canApplyRefund = true;
let filter = skuVOList.filter(c => c.canRefundNum > 0);
if (filter.length > 0) {
canApplyRefund = true;
}
else {
canApplyRefund = false;
}
this.data.totalGoodsPrice = parseFloat(sum).toFixed(2);
this.data.orderInfo = data;
this.setData({
orderInfo: this.data.orderInfo,
totalGoodsPrice: this.data.totalGoodsPrice,
mergedAmount: data.mergedAmount || 0,
canApplyRefund: canApplyRefund
});
}
}
})
},
//确认用收货
onTapSureGetGoods(){
let _this = this;
wx.showModal({
title: '自提收货确认',
content: '请确认用户已经收货切用户已同意收货',
confirmText: '确认收货',
confirmColor: '#cb3c3c',
showCancel: false,
success(confirm) {
if (confirm.confirm) {
_this.sureDeliveryGoods(_this.data.id);
}
},
})
},
//调用接口
sureDeliveryGoods(id){
wx.showLoading({
title: '请求中..',
});
wxService.post(`/sale/trade/seller/selfconfirm/${id}`).then(res => {
wx.hideLoading()
if (res) {
const { result, data } = res.data
if (result == 0) {
wx.showToast({
title: `已确认收货`,
});
setTimeout(() => {
this.getOrderInfo();
}, 200)
} else {
wx.showToast({
title: `确认收货失败!`,
icon: 'none'
})
}
}
})
}
})
\ No newline at end of file
src/subPackageA/page/pages/deliveryCode/deliveryCode.json 0 → 100644
{
"navigationBarTitleText": "确认取货",
"usingComponents": {}
}
\ No newline at end of file
src/subPackageA/page/pages/deliveryCode/deliveryCode.wxml 0 → 100644
<!--subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxml-->
<wxs src="../../../../wxs/utils.wxs" module="utils" />
<!-- 订单商品 -->
<view class="order-goods">
<view class="order-status">
<view class="order-type"><view class="tips">自提</view>{{orderInfo.storeName}}</view>
<text>{{orderInfo.orderStatusText}}</text>
</view>
<view class="pro-wrap">
<block wx:for="{{orderInfo.skuVOList}}" wx:for-item="item" wx:key="*this">
<view class="pro-list">
<image data-img="{{item.skuImgUrl}}"
bindtap='onTapShowImg' class="pro-img"
src="{{item.skuImgUrl}}" mode='aspectFit'/>
<view class="pro-info">
<view class="pro-name">{{item.productName}}</view>
<view class="pro-desc">{{item.skuSpec}}</view>
<view class="pro-price">
<text class="price">￥{{item.price}}</text>
<text class="number">x {{item.count}}</text>
</view>
<!-- 退款信息 -->
<view class="refund-info" wx:if="{{item.refundCount != 0}}">
<text class='refund-name'>退款</text>
<text>x {{item.refundCount}}</text>
</view>
</view>
</view>
</block>
</view>
<!-- 优惠信息 -->
<view class="coupon-info">
<view>商品合计</view>
<view>￥{{totalGoodsPrice}}</view>
</view>
<view class="coupon-info">
<view>活动折扣</view>
<view>￥{{utils.numberFormat(orderInfo.promotionDiscount)}}</view>
</view>
<view class="coupon-info">
<view>优惠券优惠</view>
<view>￥{{utils.numberFormat(orderInfo.coouponDiscount)}}</view>
</view>
<!-- 订单金额 -->
<view class="order-price">
共计<label>5</label>件商品，实付<label>￥{{orderInfo.payAmount}}</label>
</view>
</view>
<!-- 订单其他信息 -->
<view class="order-time">
<view class="order-items">
订单编号：{{orderInfo.id}}
<view class="copy" bindtap="copy" data-content="{{orderInfo.id}}">复制</view>
</view>
<view class="order-items">下单时间：{{orderInfo.createTime}}</view>
<view class="order-items">下单备注：{{orderInfo.buyerRemark}}</view>
</view>
<view class="guid-sure" bindtap="onTapSureGetGoods" wx:if="{{orderInfo.status == 'P'}}">确认用户收货</view>
src/subPackageA/page/pages/deliveryCode/deliveryCode.wxss 0 → 100644
/* subPackage/page/pages/selfPickUpOrderInfo/selfPickUpOrderInfo.wxss */
page{
background: #f2f2f2;
box-sizing: border-box;
-webkit-box-sizing: border-box;
padding: 20rpx;
padding-bottom: 102rpx;
}
view{
box-sizing: border-box;
-webkit-box-sizing: border-box;
}
.get-code{
width: 100%;
height: auto;
padding: 30rpx;
background: #ffffff;
margin-bottom: 20rpx;
}
.get-code .my-deliver-title{
font-size: 24rpx;
color: #333333;
font-weight: 550;
margin-bottom: 20rpx;
display: flex;
justify-content: center;
}
.get-code .my-code{
width: 100%;
height: auto;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
}
.get-code .my-code canvas{
width: 640rpx;
height: 140rpx;
margin-bottom: 10rpx;
}
.get-code .my-code label{
letter-spacing: 2rpx;
font-size: 28rpx;
color: #666666;
}
.order-info-store{
width: 100%;
height: auto;
background: #ffffff;
padding: 30rpx;
margin-bottom: 20rpx;
}
.copy{
display: inline-block;
width: 44rpx;
height: 26rpx;
line-height: 26rpx;
border-radius: 6rpx;
border: 1px solid rgba(203, 60, 60, 1);
font-size: 16rpx;
color: #cb3c3c;
text-align: center;
margin-left: 26rpx;
vertical-align: top;
}
.order-info-store .header{
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 10rpx;
}
.order-info-store .header .lf-info{
flex: 1;
display: flex;
align-items: center;
font-size: 28rpx;
color: #333333;
font-weight: 550;
}
.order-info-store .header .lf-info image{
width: 28rpx;
height: 28rpx;
margin-right: 5rpx;
}
.order-info-store .header .rg-btn{
flex: 0;
min-width: 110rpx;
max-width: 110rpx;
height: 52rpx;
border: solid 1px #cb3c3c;
color: #cb3c3c;
font-size: 24rpx;
border-radius: 26rpx;
display: flex;
align-items: center;
justify-content: center;
}
.order-info-store .header .rg-btn:active{
opacity: 0.7;
}
.order-info-store .header .rg-btn image{
width: 20rpx;
margin-left: 5rpx;
height: 24rpx;
}
.order-info-store .store-address{
font-size: 24rpx;
color: #666666;
}
.pro-wrap{
padding: 0rpx 30rpx;
background-color: #ffffff;
}
.choose-pro{
color: #757575;
font-size: 26rpx;
}
.pro-total-price{
font-size: 26rpx;
color: #333333;
}
.total-price{
color: #cb3c3c;
font-size: 28rpx;
}
.pro-list{
border-bottom: 1px solid #eeeeee;
padding:31rpx 0 25rpx;
display: flex;
}
.pro-list:last-child{
border-bottom: none;
}
.refund-info{
display: flex;
justify-content: space-between;
align-items: center;
font-size: 22rpx;
color: #cb3c3c;
margin-top: 5rpx;
opacity: 0.7;
}
.refund-info .refund-name{
color: #cb3c3c;
}
.pro-img{
width: 160rpx;
height: 160rpx;
vertical-align: top;
}
.pro-info{
display: inline-block;
margin-left: 28rpx;
vertical-align: top;
}
.pro-name{
font-size: 25rpx;
color: #333333;
width: 500rpx;
line-height:36rpx;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 1;
line-clamp: 1;
-webkit-box-orient: vertical;
}
.pro-desc{
font-size: 22rpx;
color: #999999;
margin-top: 10rpx;
}
.pro-price{
margin-top: 12rpx;
}
.price{
color: #cb3c3c;
font-size: 32rpx;
}
.number{
float: right;
font-size: 26rpx;
color: #808080;
}
.pro-sum{
padding: 0 20rpx 90rpx;
}
.order-goods{
background: #FFFFFF;
margin-bottom: 20rpx;
}
.order-goods .order-status{
display: flex;
align-items: center;
justify-content: space-between;
font-size: 24rpx;
color: #333333;
padding: 20rpx 30rpx;
padding-bottom: 0;
}
.order-goods .order-status .order-type{
display: flex;
align-items: center;
}
.order-goods .order-status .order-type .tips{
padding: 5rpx 6rpx;
font-size: 20rpx;
background: rgba(255,34,34,0.1);
color: #cb3c3c;
margin-right: 20rpx;
border-radius: 6rpx;
}
.order-goods .coupon-info{
padding: 20rpx 30rpx;
border-bottom: solid 2rpx #eeeeee;
display: flex;
align-items: center;
font-size: 24rpx;
justify-content: space-between;
color: #fa6d0d;
}
.order-goods .order-price{
padding: 30rpx;
font-size: 28rpx;
display: flex;
align-items: center;
justify-content: flex-end;
color: #999999;
}
.order-goods .order-price label{
color: #333333;
font-weight: 550;
}
/* 订单 */
.order-time{
background: #ffffff;
padding: 30rpx;
font-size: 28rpx;
color: #333333;
}
.order-time .order-items{
display: flex;
align-items: center;
margin-bottom: 10rpx;
}
.order-time .order-items :last-child{
margin-bottom: 0;
}
.guid-sure{
width: 100%;
height: 80rpx;
background: linear-gradient(to right, rgba(203,60,60,0.5) , #cb3c3c);
display: flex;
align-items: center;
justify-content: center;
color: #ffffff;
font-size: 28rpx;
border-radius: 8rpx;
margin-top: 30rpx;
}
\ No newline at end of file
src/wxParser/index.wxml
......@@ -24,7 +24,7 @@
</view>
</template>
<template name="wxParserImg">
<image class="{{item.classStr}} wxParser-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="widthFix" bindload="loadedWxParserImg" bindtap="tapWxParserImg" style="{{item.styleStr}}"/>
<image class="{{item.classStr}} wxParser-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="widthFix" lazy-load bindload="loadedWxParserImg" bindtap="tapWxParserImg" style="{{item.styleStr}}"/>
</template>
<template name="wxParserText">
<view class="wxParserText wxParser-inline" style="{{item.styleStr}}">
......@@ -1336,7 +1336,7 @@
</view>
</template>
<template name="wxParserImg">
<image class="{{item.classStr}} wxParser-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="widthFix" bindload="loadedWxParserImg" bindtap="tapWxParserImg" style="{{item.styleStr}}"/>
<image class="{{item.classStr}} wxParser-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="widthFix" lazy-load bindload="loadedWxParserImg" bindtap="tapWxParserImg" style="{{item.styleStr}}"/>
</template>
<template name="wxParserText">
<view class="wxParserText wxParser-inline" style="{{item.styleStr}}">
......
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