diff --git a/pages/news3/ManualEntry.vue b/pages/news3/ManualEntry.vue
index c21dc5a..2a8a998 100644
--- a/pages/news3/ManualEntry.vue
+++ b/pages/news3/ManualEntry.vue
@@ -136,7 +136,7 @@
chatList: [],
expressList: [],
action: '',
- action: '',
+ header: '',
}
},
onReady() {
@@ -307,11 +307,7 @@
uni.showToast({
title: "上传成功"
})
- let idList = []
- list.forEach(item => {
- idList.push(item.response.data.fileInfo.file_id)
- });
- this.form.transfer_image_id = idList.join(',');
+ this.form.transfer_image_id = this.handleRemove('', list);
}
}
},
@@ -327,7 +323,7 @@
},
chatRemove(file, fileList) {
- this.form.transfer_image_id = this.handleRemove(file, fileList);
+ this.form.chat_image_id = this.handleRemove(file, fileList);
},
//接受上传返回的数据
chatSuccess(list) {
@@ -339,11 +335,7 @@
uni.showToast({
title: "上传成功"
})
- let idList = []
- list.forEach(item => {
- idList.push(item.response.data.fileInfo.file_id)
- });
- this.form.chat_image_id = idList.join(',');
+ this.form.chat_image_id = this.handleRemove('', list);
}
}
},
diff --git a/pages/order/express/index.vue b/pages/order/express/index.vue
index e556055..c7e8233 100644
--- a/pages/order/express/index.vue
+++ b/pages/order/express/index.vue
@@ -1,269 +1,279 @@
-
-
-
-
-
-
-
-
-
- 共{{ goods.delivery_num }}件
-
-
-
-
-
-
- 物流公司：
-
- 无需物流
- {{ express[curTab].express ? express[curTab].express.express_name : '--' }}
-
-
-
- 物流单号：
-
- {{ express[curTab].express_no ? express[curTab].express_no : '--' }}
-
- 复制
-
-
-
-
-
-
-
-
-
-
- {{ item.context }}
-
-
- {{ item.time }}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 共{{ goods.delivery_num }}件
+
+
+
+
+
+
+ 物流公司：
+
+ 无需物流
+ {{ express[curTab].express ? express[curTab].express.express_name : '--' }}
+
+
+
+ 物流单号：
+
+ {{ express[curTab].express_no ? express[curTab].express_no : '--' }}
+
+ 复制
+
+
+
+
+
+
+
+
+
+
+ {{ item.context }}
+
+
+ {{ item.time }}
+
+
+
+
+
+
\ No newline at end of file
+ // 通栏卡片
+ .i-card {
+ background: #fff;
+ padding: 24rpx 24rpx;
+ }
+
+ // 物流公司
+ .express {
+ margin-bottom: 20rpx;
+
+ .info-item {
+ display: flex;
+ margin-bottom: 24rpx;
+
+ &:last-child {
+ margin-bottom: 0;
+ }
+
+ .item-lable {
+ display: flex;
+ align-items: center;
+ font-size: 24rpx;
+ color: #999;
+ margin-right: 6rpx;
+ }
+
+ .item-content {
+ flex: 1;
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ color: #333;
+
+ .act-copy {
+ margin-left: 20rpx;
+ padding: 2rpx 20rpx;
+ font-size: 22rpx;
+ color: #666;
+ border: 1rpx solid #c1c1c1;
+ border-radius: 16rpx;
+ }
+ }
+ }
+
+ }
+
+ // 商品列表
+ .deliver-goods-list {
+ margin-top: 20rpx;
+ margin-bottom: -30rpx;
+
+ .goods-item {
+ position: relative;
+ border-radius: 8rpx;
+ overflow: hidden;
+ width: 130rpx;
+ height: 130rpx;
+ float: left;
+ margin-right: 30rpx;
+ margin-bottom: 30rpx;
+ }
+
+ .goods-img {
+ display: block;
+ width: 100%;
+ height: 100%;
+ }
+
+ .title {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ text-align: center;
+ background: rgba(0, 0, 0, 0.6);
+ color: #fff;
+ padding: 4rpx 0;
+ font-size: 24rpx;
+ }
+ }
+
+ // 物流轨迹
+ .logis-detail {
+ padding: 30rpx;
+ background-color: #fff;
+
+ .logis-item {
+ position: relative;
+ padding: 10px 0 10px 25px;
+ box-sizing: border-box;
+ border-left: 2px solid #ccc;
+
+ &.first {
+ border-left: 2px solid #f40;
+
+ &:after {
+ background: #f40;
+ }
+
+ .logis-item-content {
+ background: #ff6e39;
+ color: #fff;
+
+ &:after {
+ border-bottom-color: #ff6e39;
+ }
+ }
+ }
+
+ &:after {
+ content: ' ';
+ display: inline-block;
+ position: absolute;
+ left: -6px;
+ top: 30px;
+ width: 6px;
+ height: 6px;
+ border-radius: 10px;
+ background: #bdbdbd;
+ border: 2px solid #fff;
+ }
+
+ .logis-item-content {
+ position: relative;
+ background: #f9f9f9;
+ padding: 10rpx 20rpx;
+ box-sizing: border-box;
+ color: #666;
+
+ &:after {
+ content: '';
+ display: inline-block;
+ position: absolute;
+ left: -10px;
+ top: 18px;
+ border-left: 10px solid #fff;
+ border-bottom: 10px solid #f3f3f3;
+ }
+ }
+ }
+ }
+
diff --git a/pages/order/refund/index.vue b/pages/order/refund/index.vue
index 70118a4..8fadd52 100644
--- a/pages/order/refund/index.vue
+++ b/pages/order/refund/index.vue
@@ -13,21 +13,21 @@
-
+
我要退货退款已收到货，需要退还已收到的货物
-
+
我要退款（无需退货）未收到货，或与商家协商之后申请
-
+
我要换货对收到的商品不满意，可与商家协商换货
diff --git a/pages/order/refund/refund.vue b/pages/order/refund/refund.vue
index 788819d..ee3f72f 100644
--- a/pages/order/refund/refund.vue
+++ b/pages/order/refund/refund.vue
@@ -64,26 +64,24 @@
-
-
-
-
-
-
-
-
-
- 上传图片
- {{imageList.length>0?imageList.length:0}}/{{maxImageLength}}
-
-
+
+
+
+
+
+ 上传图片
+
+
+
联系电话
-
- 提交申请
+
+ 提交申请
@@ -136,8 +134,18 @@
phone: '',
imageList: [],
maxImageLength: 6,
- imagesId: ''
- };
+ imagesId: '',
+ action: '',
+ header: '',
+ }
+ },
+ onReady() {
+ this.action = (Config.get('apiUrl') + 'upload/image').replace("index.php?s=/", "")
+ this.header = {
+ 'Storeid': uni.getStorageSync('Store').storeInfo.store_id,
+ 'Access-Token': uni.getStorageSync('AccessToken'),
+ 'platform': "MP-WEIXIN",
+ }
},
onLoad(op) {
this.deliveryStatus = op.deliveryStatus;
@@ -147,46 +155,30 @@
this.value = this.order.is_user_grade ? this.order.grade_goods_price : this.order.goods_price;
},
methods: {
- deleteImage(imageIndex) {
- this.imageList.splice(imageIndex, 1)
- },
- // 选择图片
- chooseImage() {
- const app = this
- const oldImageList = app.imageList
- // 选择图片
- uni.chooseImage({
- count: app.maxImageLength - oldImageList.length,
- sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
- sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
- success({
- tempFiles
- }) {
- app.imageList = oldImageList.concat(tempFiles)
+ //接受上传返回的数据
+ onSuccess(list) {
+ if (list.length > 0) {
+ const {
+ response
+ } = list[0];
+ if (response.status == 200) {
+ uni.showToast({
+ title: "上传成功"
+ })
+ this.imagesId = this.handleRemove('', list);
}
- });
+ }
},
-
- // 上传图片
- uploadFile() {
- const app = this
- console.log(this.imageList)
- const {
- imageList
- } = app
- // 批量上传
- return new Promise((resolve, reject) => {
- if (imageList.length > 0) {
- UploadApi.image(imageList)
- .then(fileIds => {
- app.imagesId = fileIds;
- resolve(fileIds)
- })
- .catch(reject)
- } else {
- resolve()
- }
- })
+ onRemove(file, fileList) {
+ this.imagesId = this.handleRemove(file, fileList);
+ },
+ handleRemove: function(file, fileList) {
+ let idList = []
+ fileList.forEach(item => {
+ idList.push(item.response.data.fileInfo.file_id)
+ });
+ return idList.join(',')
+
},
onValue(e) {
if ((Number(e.detail.value) > Number(this.value)) == false) {
@@ -481,23 +473,6 @@
}
}
-
- &-fd {
- width: 664rpx;
- height: 104rpx;
- background: #F55349;
- border-radius: 8rpx;
- text-align: center;
- margin: 0 auto;
- margin-top: 60rpx;
- font-size: 32rpx;
- font-weight: 500;
- color: #FFFFFF;
- display: flex;
- align-items: center;
- justify-content: center;
- }
-
&-money {
width: 100%;
background: #FFFFFF;
@@ -563,7 +538,7 @@
margin-top: 20rpx;
padding: 26rpx 26rpx 26rpx 48rpx;
box-sizing: border-box;
-
+ margin-bottom: 200rpx;
.a {
display: flex;
align-items: center;
@@ -636,38 +611,26 @@
}
}
- .photo {
- display: flex;
- justify-content: flex-start;
- padding: 20rpx 0;
- overflow: hidden;
- }
-
- .file_img {
- overflow: hidden;
- position: relative;
-
- image {
- width: 80px;
- height: 80px;
- margin-right: 10rpx;
- }
-
- .image-delete {
- position: absolute;
- top: -10rpx;
- right: -10rpx;
- height: 42rpx;
- width: 42rpx;
- background: rgba(0, 0, 0, 0.64);
- border-radius: 50%;
- color: #fff;
- font-weight: bolder;
- font-size: 22rpx;
- z-index: 10;
- display: flex;
- justify-content: center;
- align-items: center;
+ .goods-fd {
+ width: 100%;
+ position: fixed;
+ left: 0;
+ bottom: 0;
+ padding: 0.9375rem;
+ z-index: 99;
+ background-color: #fafafa;
+ box-sizing: border-box;
+
+ .btn {
+ width: 630rpx;
+ line-height: 88rpx;
+ background: #F34A40;
+ border-radius: 88rpx;
+ text-align: center;
+ font-size: 28rpx;
+ font-weight: 500;
+ color: #FFFFFF;
+ margin: auto;
}
}