申请退换货页面及重构page.json

apis/interfaces/pay.js

@@ -24,8 +24,18 @@ const alPAY = (orderNo) => {
         }
     })
 }
+const dtPAY = (orderNo) => {
+    return request({
+        url: 'mall/pay/' + orderNo + '/account',
+        data: {
+            type: 'app'
+        }
+    })
+}
+
 
 export {
 	wxPAY,
-	alPAY
+	alPAY,
+    dtPAY
 }

pages.json

@@ -173,10 +173,10 @@
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		}, {
-			"path": "pages/refund/refund",
+			"path": "pages/refund/refund_or_exchange_apply",
-			"name": "Refund",
+			"name": "RefundOrExchangeApply",
 			"style": {
-				"navigationBarTitleText": "退货",
+				"navigationBarTitleText": "退换货申请",
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
 		}, {

pages/pay/pay.vue

@@ -1,26 +1,29 @@
 <template>
     <view>
-        <oct-pay :price="price" :payNo="payNo" color="#34CE98" price-color="#e6576b" :payPlatform="platform"
+        <oct-pay :price="price" :coins="coins" :payNo="payNo" color="#34CE98" price-color="#e6576b"
-            @onPay="pay" />
+            :payPlatform="platform" @onPay="pay" />
     </view>
 </template>
 
 <script>
     import {
         wxPAY,
-        alPAY
+        alPAY,
+        dtPAY
     } from '@/apis/interfaces/pay'
     export default {
         data() {
             return {
                 payNo: "",
                 price: "",
+                coins: "",
                 platform: ['dtpay']
             }
         },
         mounted() {
             this.payNo = this.$Route.query.orderNo
             this.price = Number(this.$Route.query.price).toFixed(2)
+            this.coins = this.$Route.query.coins
         },
         methods: {
             pay(e) {
@@ -47,12 +50,15 @@
                         }
                         if (e.platform === 'wxpay') this.getWXPAY(e.platform)
                         if (e.platform === 'alipay') this.getALPAY(e.platform)
-                       
                     }
                 })
             },
             getDTPAY() {
                 console.log('dt 支付。。。')
+                dtPAY(this.payNo).then(res => {
+                    console.log(res);
+                    // this.callPay(res, payType)
+                    if (res.state === 'warning') {
                         uni.showModal({
                             title: '当前DT积分不足',
                             content: '不能支付该订单，是否放弃当前支付',
@@ -62,12 +68,41 @@
                             cancelColor: "#666666",
                             success: (res) => {
                                 if (res.confirm) {
-                            
+                                    this.$Router.push({
+                                        name: "AccountRecharge"
+                                    })
                                 } else {
                                     uni.navigateBack();
                                 }
                             }
                         })
+                    } else {
+                        uni.showModal({
+                            title: '支付成功',
+                            content: '该订单已支付成功',
+                            confirmText: '我的订单',
+                            confirmColor: "#34CE98",
+                            cancelText: '再逛逛',
+                            cancelColor: "#666666",
+                            success: (res) => {
+                                // if (res.confirm) {
+                                //     this.$Router.push({
+                                //         name: "AccountRecharge"
+                                //     })
+                                // } else {
+                                //     uni.navigateBack();
+                                // }
+                            }
+                        })
+                    }
+                }).catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: "none",
+                        mask: true,
+                    })
+                })
+
             },
             getALPAY(payType) {
                 alPAY(this.payNo).then(res => {

pages/refund/aftersale.vue

@@ -51,6 +51,8 @@
             </view>
         </view>
 
+        <view class=" introduce"> 退换货说明 </view>
+
     </view>
 </template>
 
@@ -67,9 +69,9 @@
                         "is_self": true
                     },
                     "is_self": true,
-                    "name": "铜锣烧蛋糕",
+                    "name": "铜锣烧蛋糕铜锣烧蛋糕铜锣烧",
                     "description": "口感丰富，悠闲小食",
-                    "cover": "http://storage.zh.shangkelian.cn/images/2022/01/11/37ecc570f9d7ad929a693d24118a0311.png",
+                    "cover": "https://gl-ecological.oss-cn-zhangjiakou.aliyuncs.com/images/2022/06/08/0dcb67738c93b2e1c8a489d8ac39266e.png",
                     "tags": [],
                     "original_price": 155,
                     "price": {
@@ -85,15 +87,25 @@
         },
         methods: {
             goSales(type) {
-                console.log(type);
+                this.$Router.push({
-                if(type === 'refund') return this.$Router.push({name:'Refund'}); ;
+                    name: 'RefundOrExchangeApply',
-                this.$Router.push({name:'Exchange'});
+                    params:{
+                        type:type
+                    }
+                });
             }
         }
     }
 </script>
 
 <style lang="scss">
+    .introduce {
+        padding-top: 30rpx;
+        font-size: 28rpx;
+        color: #1890FF;
+        text-align: center;
+    }
+
     .afterSales {
         background-color: #f9f9f9;
         min-height: 100vh;
@@ -126,7 +138,7 @@
             background-color: #Fff;
             width: 100%;
             display: inline-block;
-            border-bottom: solid 1rpx #eee;
+            // border-bottom: solid 1rpx #eee;
             border-radius: 0 0 30rpx 30rpx;
             // padding: $padding;
             padding-left: $padding;
@@ -149,43 +161,44 @@
                 padding: $padding - 10;
 
                 &>.title {
-                    font-size: 28rpx;
+                    font-size: 30rpx;
                     color: #333;
+                    font-weight: bold;
                     // @extend .ellipsis-1;
                 }
 
                 &>.sub_title {
                     color: #a05f0c;
-                    font-size: 24rpx;
+                    font-size: 26rpx;
-                    padding-top: 4rpx;
+                    padding-top: 6rpx;
                     // @extend .ellipsis-1;
                 }
 
                 &>.price {
-                    padding-top: $padding/2;
+                    padding-top: 10rpx;
                     display: flex;
                     flex-direction: row;
                     align-items: flex-end;
-                    justify-content: flex-start;
+                    justify-content: flex-end;
                     box-sizing: border-box;
-                    line-height: 40rpx;
                     font-weight: bold;
-                    font-size: 32rpx;
+                    font-size: 36rpx;
                     color: $text-price;
 
                     // @extend .ellipsis-1;
                     .price-type {
                         display: flex;
                         flex-direction: row;
-                        align-items: flex-end;
+                        align-items: center;
                         justify-content: space-between;
                         box-sizing: border-box;
                         flex: 1;
 
                         text {
                             margin-right: $margin/2;
-                            padding-left: 6rpx;
+                            padding-left: 10rpx;
-                            font-size: 70%;
+                            font-size: 60%;
+                            padding-bottom: 4rpx;
                         }
 
                         .kucun {
@@ -196,6 +209,7 @@
 
                 }
             }
+
         }
 
         .sales {
@@ -221,7 +235,7 @@
                     justify-content: flex-start;
                     box-sizing: border-box;
                     font-size: 32rpx;
-                    font-weight: bolder;
+                    font-weight: bold;
 
                     .icon {
                         width: 60rpx;
@@ -238,13 +252,13 @@
                     align-items: center;
                     justify-content: flex-end;
                     box-sizing: border-box;
-                    font-size: 26rpx;
+                    font-size: 28rpx;
                     color: #666;
 
                     .sales-des {
                         display: flex;
                         flex-direction: column;
-                        align-items: center;
+                        align-items: flex-end;
                         justify-content: flex-end;
                         box-sizing: border-box;
 

pages/refund/exchange.vue

@@ -1,5 +1,5 @@
 <template>
-    <view class="Refund">
+    <view class="afterSales">
         <view class="service-content">
             <view class="service"> 本次售后服务将由<span>DT生态平台</span>为您提供服务 </view>
         </view>
@@ -16,6 +16,7 @@
                 </view>
             </view>
         </view>
+        
     </view>
 </template>
 
@@ -32,9 +33,9 @@
                         "is_self": true
                     },
                     "is_self": true,
-                    "name": "铜锣烧蛋糕",
+                    "name": "铜锣烧蛋糕铜锣烧蛋糕铜锣烧蛋糕铜锣烧蛋糕铜锣烧蛋糕铜锣烧蛋糕铜锣烧蛋糕",
                     "description": "口感丰富，悠闲小食",
-                    "cover": "http://storage.zh.shangkelian.cn/images/2022/01/11/37ecc570f9d7ad929a693d24118a0311.png",
+                    "cover": "https://gl-ecological.oss-cn-zhangjiakou.aliyuncs.com/images/2022/06/08/0dcb67738c93b2e1c8a489d8ac39266e.png",
                     "tags": [],
                     "original_price": 155,
                     "price": {
@@ -47,11 +48,24 @@
                     "sales": 7394
                 },
             }
+        },
+        methods: {
+            
         }
     }
 </script>
 
 <style lang="scss">
+    .introduce {
+        padding-top: 30rpx;
+        font-size: 28rpx;
+        color: #1890FF;
+        text-align: center;
+    }
+
+    .afterSales {
+        background-color: #f9f9f9;
+        min-height: 100vh;
 
         .service-content {
             background-color: #Fff;
@@ -81,7 +95,7 @@
             background-color: #Fff;
             width: 100%;
             display: inline-block;
-        border-bottom: solid 1rpx #eee;
+            // border-bottom: solid 1rpx #eee;
             border-radius: 0 0 30rpx 30rpx;
             // padding: $padding;
             padding-left: $padding;
@@ -104,43 +118,44 @@
                 padding: $padding - 10;
 
                 &>.title {
-                font-size: 28rpx;
+                    font-size: 30rpx;
                     color: #333;
+                    font-weight: bold;
                     // @extend .ellipsis-1;
                 }
 
                 &>.sub_title {
                     color: #a05f0c;
-                font-size: 24rpx;
+                    font-size: 26rpx;
-                padding-top: 4rpx;
+                    padding-top: 6rpx;
                     // @extend .ellipsis-1;
                 }
 
                 &>.price {
-                padding-top: $padding/2;
+                    padding-top: 10rpx;
                     display: flex;
                     flex-direction: row;
                     align-items: flex-end;
-                justify-content: flex-start;
+                    justify-content: flex-end;
                     box-sizing: border-box;
-                line-height: 40rpx;
                     font-weight: bold;
-                font-size: 32rpx;
+                    font-size: 36rpx;
                     color: $text-price;
 
                     // @extend .ellipsis-1;
                     .price-type {
                         display: flex;
                         flex-direction: row;
-                    align-items: flex-end;
+                        align-items: center;
                         justify-content: space-between;
                         box-sizing: border-box;
                         flex: 1;
 
                         text {
                             margin-right: $margin/2;
-                        padding-left: 6rpx;
+                            padding-left: 10rpx;
-                        font-size: 70%;
+                            font-size: 60%;
+                            padding-bottom: 4rpx;
                         }
 
                         .kucun {
@@ -151,7 +166,8 @@
 
                 }
             }
+
         }
 
-    
+ }
 </style>

pages/refund/refund.vue

@@ -1,159 +0,0 @@
-<template>
-    <view class="Refund">
-        <view class="service-content">
-            <view class="service"> 本次售后服务将由<span>DT生态平台</span>为您提供服务 </view>
-        </view>
-        <!-- 商品信息 -->
-        <view class="goods-item" @click="onGoods(goodsInfo.goods_id)">
-            <image :src="goodsInfo.cover" mode="aspectFill" class="good-img" />
-            <view class="item--content">
-                <view class="title">{{goodsInfo.name}}</view>
-                <view class="sub_title">{{goodsInfo.shop.name}}</view>
-                <view class="price">{{goodsInfo.price.price_min || '0'}}
-                    <view class="price-type">
-                        <text> DT积分</text>
-                    </view>
-                </view>
-            </view>
-        </view>
-    </view>
-</template>
-
-<script>
-    export default {
-        data() {
-            return {
-                goodsInfo: {
-                    "goods_id": 56,
-                    "shop": {
-                        "shop_id": 1,
-                        "name": "平台自营店铺",
-                        "cover": "",
-                        "is_self": true
-                    },
-                    "is_self": true,
-                    "name": "铜锣烧蛋糕",
-                    "description": "口感丰富，悠闲小食",
-                    "cover": "http://storage.zh.shangkelian.cn/images/2022/01/11/37ecc570f9d7ad929a693d24118a0311.png",
-                    "tags": [],
-                    "original_price": 155,
-                    "price": {
-                        "show": "100",
-                        "score": 1,
-                        "price_min": 100,
-                        "price_max": 100
-                    },
-                    "clicks": 0,
-                    "sales": 7394
-                },
-            }
-        }
-    }
-</script>
-
-<style lang="scss">
-    .Refund {
-        min-height: 100vh;
-        background-color: #f9f9f9;
-    }
-
-    .service-content {
-        background-color: #Fff;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: center;
-        box-sizing: border-box;
-
-        .service {
-            font-size: 24rpx;
-            margin: $margin;
-            padding: 4rpx 20rpx;
-            border-radius: 30rpx;
-            background-color: #f9f9f9;
-            display: inline-block;
-            text-align: center;
-            color: #666;
-
-            span {
-                color: $text-price;
-            }
-        }
-    }
-
-    .goods-item {
-        background-color: #Fff;
-        width: 100%;
-        display: inline-block;
-        border-bottom: solid 1rpx #eee;
-        border-radius: 0 0 30rpx 30rpx;
-        // padding: $padding;
-        padding-left: $padding;
-        padding-top: $padding;
-        padding-bottom: $padding;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: flex-start;
-        box-sizing: border-box;
-
-        .good-img {
-            width: 160rpx;
-            height: 160rpx;
-            border-radius: 10rpx;
-        }
-
-        .item--content {
-            flex: 1;
-            padding: $padding - 10;
-
-            &>.title {
-                font-size: 28rpx;
-                color: #333;
-                // @extend .ellipsis-1;
-            }
-
-            &>.sub_title {
-                color: #a05f0c;
-                font-size: 24rpx;
-                padding-top: 4rpx;
-                // @extend .ellipsis-1;
-            }
-
-            &>.price {
-                padding-top: $padding/2;
-                display: flex;
-                flex-direction: row;
-                align-items: flex-end;
-                justify-content: flex-start;
-                box-sizing: border-box;
-                line-height: 40rpx;
-                font-weight: bold;
-                font-size: 32rpx;
-                color: $text-price;
-
-                // @extend .ellipsis-1;
-                .price-type {
-                    display: flex;
-                    flex-direction: row;
-                    align-items: flex-end;
-                    justify-content: space-between;
-                    box-sizing: border-box;
-                    flex: 1;
-
-                    text {
-                        margin-right: $margin/2;
-                        padding-left: 6rpx;
-                        font-size: 70%;
-                    }
-
-                    .kucun {
-                        color: $text-gray;
-                        font-weight: normal;
-                    }
-                }
-
-            }
-        }
-    }
-</style>

pages/refund/refund_or_exchange_apply.vue

@@ -0,0 +1,329 @@
+<template>
+    <view class="afterSales">
+        <view class="service-content">
+            <view class="service"> 本次售后服务将由<span>DT生态平台</span>为您提供服务 </view>
+        </view>
+        <!-- 商品信息 -->
+        <view class="goods-item" @click="onGoods(goodsInfo.goods_id)">
+            <image :src="goodsInfo.cover" mode="aspectFill" class="good-img" />
+            <view class="item--content">
+                <view class="title">{{goodsInfo.name}}</view>
+                <view class="sub_title">{{goodsInfo.shop.name}}</view>
+                <view class="price">{{goodsInfo.price.price_min || '0'}}
+                    <view class="price-type">
+                        <text> DT积分</text>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <!-- 申请数量 -->
+        <view class="apply-number">
+            <view class="apply-number-title">
+                申请数量<text>（最多可申请3个）</text>
+            </view>
+            <uni-section title="设置最小值和最大值" subTitle="使用 min \ max 属性设置最大最小值" type="line" padding>
+                <uni-number-box :min="1" :max="9" />
+            </uni-section>
+        </view>
+        <!--  退货方式 -->
+        <view class="block info-box">
+            <view class="info-item">
+                <view class="label">申请原因</view>
+                <view class="nowrap info-item-title" @click="changeReason">请选择申请原因
+                    <uni-icons class="icons" type="more-filled" color="grey" />
+                </view>
+            </view>
+            <view class="info-item">
+                <view class="label">商品状态</view>
+                <view class="nowrap">
+                    <label class="radio ">
+                        <radio value="r1" color="#34CE98" checked="true" style="transform:scale(0.7)" />已破损
+                    </label>
+                    <label class="radio " style="padding-left: 20rpx;">
+                        <radio value="r2" color="#34CE98" style="transform:scale(0.7)" />未破损
+                    </label>
+                </view>
+            </view>
+            <view class="info-item">
+                <view class="label">备注</view>
+                <textarea class="info-textarea" v-model="remark" placeholder="请描述申请售后服务的具体原因"></textarea>
+            </view>
+        </view>
+
+        <view class=" applyBtn">申请{{this.type === 'refund'?'退货':'换货'}}</view>
+
+
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                remark: '',
+                type: '',
+                goodsInfo: {
+                    "goods_id": 56,
+                    "shop": {
+                        "shop_id": 1,
+                        "name": "平台自营店铺",
+                        "cover": "",
+                        "is_self": true
+                    },
+                    "is_self": true,
+                    "name": "铜锣烧蛋糕铜锣烧蛋糕铜锣烧蛋糕",
+                    "description": "口感丰富，悠闲小食",
+                    "cover": "https://gl-ecological.oss-cn-zhangjiakou.aliyuncs.com/images/2022/06/08/0dcb67738c93b2e1c8a489d8ac39266e.png",
+                    "tags": [],
+                    "original_price": 155,
+                    "price": {
+                        "show": "100",
+                        "score": 1,
+                        "price_min": 100,
+                        "price_max": 100
+                    },
+                    "clicks": 0,
+                    "sales": 7394
+                },
+            }
+        },
+        onLoad() {
+            let type = this.$Route.query.type;
+            let title = '';
+            if(type === 'refund'){
+                title = '退货申请'
+            } else{
+                title = '换货申请'
+            }
+            uni.setNavigationBarTitle({
+                title:title
+            })
+            this.type = this.$Route.query.type;
+        },
+        methods: {
+            changeReason() {
+                uni.showActionSheet({
+                    title: '选择'+this.type === 'refund'?' 退货':'换货'+'原因',
+                    itemList: ['A', 'B', 'C'],
+                    success: function(res) {
+                        console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+                    },
+                    fail: function(res) {
+                        console.log(res.errMsg);
+                    }
+                });
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    .applyBtn {
+        width: 70%;
+        background-color: $main-color;
+        border-radius: 50rpx;
+        text-align: center;
+        padding: 20rpx $padding;
+        color: #fff;
+        position: relative;
+        left: 10%;
+        font-size: 32rpx;
+        margin-top: $margin * 2;
+        font-weight: bold;
+    }
+
+    .afterSales {
+        background-color: #f9f9f9;
+        min-height: 100vh;
+
+        .service-content {
+            background-color: #Fff;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: center;
+            box-sizing: border-box;
+
+            .service {
+                font-size: 24rpx;
+                margin: $margin;
+                padding: 4rpx 20rpx;
+                border-radius: 30rpx;
+                background-color: #f9f9f9;
+                display: inline-;
+                text-align: center;
+                color: #666;
+
+                span {
+                    color: $text-price;
+                }
+            }
+        }
+
+        .goods-item {
+            background-color: #Fff;
+            width: 100%;
+            display: inline-block;
+            // border-bottom: solid 1rpx #eee;
+
+            // padding: $padding;
+            padding-left: $padding;
+            padding-top: $padding;
+            padding-bottom: $padding - 15;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-start;
+            box-sizing: border-box;
+
+            .good-img {
+                width: 160rpx;
+                height: 160rpx;
+                border-radius: 10rpx;
+            }
+
+            .item--content {
+                flex: 1;
+                padding: $padding - 10;
+
+                &>.title {
+                    font-size: 30rpx;
+                    color: #333;
+                    font-weight: bold;
+                    // @extend .ellipsis-1;
+                }
+
+                &>.sub_title {
+                    color: #a05f0c;
+                    font-size: 26rpx;
+                    padding-top: 6rpx;
+                    // @extend .ellipsis-1;
+                }
+
+                &>.price {
+                    padding-top: 10rpx;
+                    display: flex;
+                    flex-direction: row;
+                    align-items: flex-end;
+                    justify-content: flex-end;
+                    box-sizing: border-box;
+                    font-weight: bold;
+                    font-size: 36rpx;
+                    color: $text-price;
+
+                    // @extend .ellipsis-1;
+                    .price-type {
+                        display: flex;
+                        flex-direction: row;
+                        align-items: center;
+                        justify-content: space-between;
+                        box-sizing: border-box;
+                        flex: 1;
+
+                        text {
+                            margin-right: $margin/2;
+                            padding-left: 10rpx;
+                            font-size: 60%;
+                            padding-bottom: 4rpx;
+                        }
+
+                        .kucun {
+                            color: $text-gray;
+                            font-weight: normal;
+                        }
+                    }
+
+                }
+            }
+
+        }
+    }
+
+    .apply-number {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+        box-sizing: border-box;
+        background-color: #fff;
+        padding: $padding;
+        border-radius: 0 0 30rpx 30rpx;
+
+        .apply-number-title {
+            font-size: 30rpx;
+            font-weight: bold;
+
+            text {
+                font-size: 26rpx;
+                color: grey;
+                font-weight: normal;
+            }
+        }
+    }
+
+    .block {
+        background: white;
+        margin: $margin;
+        border-radius: $radius;
+    }
+
+    // 订单信息
+    .info-box {
+        .info-item {
+            position: relative;
+            padding: 40rpx $padding 40rpx 200rpx;
+            font-size: $title-size-m;
+            min-height: 40rpx;
+            text-align: right;
+
+            .radio {
+                font-size: 28rpx;
+                font-weight: bold;
+            }
+
+            .label {
+                position: absolute;
+                left: 40rpx;
+                top: 40rpx;
+                color: $text-gray;
+            }
+
+            .info-textarea {
+                height: 120rpx;
+                width: 100%;
+                text-align: left;
+                font-size: $title-size-m;
+            }
+
+            &::after {
+                position: absolute;
+                left: $margin;
+                right: $margin;
+                content: " ";
+                height: 1rpx;
+                bottom: 0;
+                background: $border-color;
+            }
+
+            &:last-child::after {
+                display: none;
+            }
+
+            .info-item-title {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: flex-end;
+                box-sizing: border-box;
+                font-size: 28rpx;
+                font-weight: bold;
+
+                .icons {
+                    padding-top: 2rpx;
+                    font-weight: normal;
+                    margin-left: 10rpx;
+                }
+            }
+        }
+    }
+</style>

pages/store/buy.vue

@@ -120,12 +120,14 @@
 					address_id	: this.address.address_id,
 					remark		: this.remark || ''
 				}).then(res => {
+                    console.log(res);
 					this.$store.commit('setAddress', {})
 					this.$Router.replace({
 						name: 'Pay',
 						params: {
 							orderNo: res.order_no,
-							price  : res.total
+							price  : res.total,
+                            coins  : res.coins,
 						}
 					})
 				})
@@ -268,6 +270,7 @@
 			}
 		}
 	}
+	
     // footer
 	.order-footer{
 		position: fixed;

pages/store/goods.vue

@@ -19,9 +19,9 @@
 			<view class="sub-title">{{goods.description}}</view>
 			<view class="box-flex">
 				<view class="price">
-					<text>¥</text>{{goods.price.show}}
+					{{goods.price.show}}<text>DT积分</text>
 				</view>
-				<view class="sales">库存量{{goods.sales}}</view>
+				<view class="sales" v-if="goods.skus">库存量{{goods.skus[0].stock}}</view>
 			</view>
             
             <!-- 店铺信息 -->
@@ -33,7 +33,7 @@
                         <view> 商品质量:<span class='no'>5.0</span> <text style="padding-left: 20rpx;">服务态度:<span class='no'>5.0</span></text> </view>
                     </view>
                 </view>
-                <view class="shopInfo-title-right" >全部商品 {{goods.shop.count || 0}} <uni-icons type="right" color="grey"/></view>
+                <view class="shopInfo-title-right" >全部商品 {{goods.shop.goods_count || 0}} <uni-icons type="right" color="grey"/></view>
 			</view>
             
             
@@ -193,8 +193,8 @@
 				color: $text-price;
 				font-size: $title-size + 10;
 				text{
-					font-size: 80%;
+					font-size: 60%;
-					margin-right: 10rpx;
+					margin-left: 10rpx;
 				}
 			}
 			.sales{

pages/store/index.vue

@@ -33,7 +33,7 @@
 						<image :src="item.cover" mode="aspectFill"></image>
 					</view>
 					<view class="news-title nowrap">{{item.name}}</view>
-					<view class="news-price nowrap">￥{{item.price.price_min}}</view>
+					<view class="news-price nowrap">{{item.price.price_min}} <text>DT积分</text></view>
 				</view>
 			</view>
 		</view>
@@ -258,6 +258,10 @@
 					font-weight: bold;
 					color: $text-price;
 					line-height: 40rpx;
+                    text{
+                        margin-left: 6rpx;
+                        font-size: 70%;
+                    }
 				}
 			}
 		}

uni_modules/oct-goods/components/oct-goods/oct-goods.vue

@@ -104,21 +104,22 @@
                     align-items: flex-end;
                     justify-content: flex-start;
                     box-sizing: border-box;
-					line-height: 40rpx;
+					// line-height: 30rpx;
 					font-weight: bold;
 					font-size: 32rpx;
 					@extend .ellipsis-1;
                     .price-type{
                       display: flex;  
                       flex-direction: row;
-                      align-items: flex-end;
+                      align-items: center;
                       justify-content: space-between;
                       box-sizing: border-box;
                       flex: 1;
                       text{
                       	margin-right: $margin/2;
                         padding-left: 6rpx;
-                      	font-size: 70%;
+                      	font-size: 60%;
+                        padding-bottom: 6rpx;
                       }
                       .kucun{
                           color: $text-gray;

uni_modules/oct-pay/components/oct-pay/oct-pay.vue

@@ -2,7 +2,7 @@
 	<view class="oct--pay">
 		<!-- 支付信息 -->
 		<view class="header">
-			<view class="price" :style="{color: priceColor}"><text>￥</text>{{price}}</view>
+			<view class="price" :style="{color: priceColor}">{{price}}<text>DT积分</text></view>
 			<view class="info">
 				<slot name="pay-info">
 					<view class="pay--no">订单号：{{payNo}}</view>
@@ -34,7 +34,10 @@
 					<label class="radio-flex">
 						<view class="radio--text">
 							<image class="radio--icon" src="../../static/dtpay.png" mode="widthFix"></image>
+							 <view class="radio--icon-bottom">
 							     DT积分
+                                 <text>拥有DT积分：{{coins}}</text>
+							 </view>
 						</view>
 						<radio value="alipay" :checked="payIndex === 0" :color="color" />
 					</label>
@@ -109,6 +112,10 @@
 			price: {
 				type:String,
 				default: '0.00'
+			},
+            coins:{
+                type:String,
+                default:'0.00'
             }
 		},
 		data(){
@@ -134,6 +141,8 @@
 	
 	.oct--pay{
 		padding: $margin;
+        min-height: 100vh;
+        background-color: #f9f9f9;
 		&>.header{
 			text-align: center;
 			padding: ($margin*2) $margin;
@@ -141,21 +150,25 @@
 				font-size: 58rpx;
 				font-weight: bold;
 				&>text{
-					font-size: 70%;
+					font-size: 50%;
+                    padding-left: 10rpx;
 				}
 			}
 			.info{
 				.pay--no{
 					color: #82848a;
-					font-size: 30rpx;
+					font-size: 28rpx;
+                    padding-top: 20rpx;
 				}
 			}
 		}
 		&>.radios{
 			.radio--item{
 				margin-bottom: $margin;
+                margin-top: $margin;
 				background: white;
 				border-radius: $radius;
+                padding: 20rpx 0;
 				.radio-flex{
 					height: 100rpx;
 					padding: 0 $margin;
@@ -169,12 +182,31 @@
 					}
 				}
 				.radio--text{
+                    display: flex;
+                    flex-direction: row;
+                    align-items: center;
+                    justify-content: center;
+                    box-sizing: border-box;
+                    height: 100rpx;
 					.radio--icon{
-						width: 52rpx;
+						width: 80rpx;
-						height: 52rpx;
+						height: 80rpx;
 						margin: 0;
 						vertical-align: middle;
 						margin-right: $margin/3;
+                        position: relative;
+                        top: 10rpx;
+					}
+                    .radio--icon-bottom{
+                        display: flex;
+                        flex-direction: column;
+                        align-items: flex-start;
+                        justify-content: center;
+                        box-sizing: border-box;
+                        text{
+                            font-size: 24rpx;
+                            color: grey;
+                        }
                     }
 				}
 			}

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/auth/auth","pages/auth/role","pages/life/life","pages/store/index","pages/user/index","pages/setting/setting","pages/store/goods","pages/store/buy","pages/order/index","pages/order/details","pages/address/index","pages/address/edit","pages/pay/pay","pages/store/list","pages/store/meals","pages/store/search","pages/refund/list","pages/refund/aftersale","pages/refund/refund","pages/refund/exchange","pages/account/integral","pages/account/dt","pages/account/recharge","pages/vip/vip","pages/vip/agreement","pages/team/index","pages/store/shop/shopDetail","pages/store/shop/shopList"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"ZH健康","navigationBarBackgroundColor":"#F3F6FB","backgroundColorTop":"#F3F6FB","backgroundColorBottom":"#F3F6FB"},"tabBar":{"borderStyle":"white","selectedColor":"#34CE98","list":[{"iconPath":"static/tabBar/tabBar_02.png","selectedIconPath":"static/tabBar/tabBar_show_02.png","pagePath":"pages/life/life","text":"共力人生"},{"iconPath":"static/tabBar/tabBar_02.png","selectedIconPath":"static/tabBar/tabBar_show_02.png","pagePath":"pages/store/index","text":"DT商城"},{"iconPath":"static/tabBar/tabBar_03.png","selectedIconPath":"static/tabBar/tabBar_show_03.png","pagePath":"pages/user/index","text":"我的"}]},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"ZH-HEALTH","compilerVersion":"3.3.11","entryPagePath":"pages/auth/auth","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniConfig = {"pages":["pages/auth/auth","pages/auth/role","pages/life/life","pages/store/index","pages/user/index","pages/setting/setting","pages/store/goods","pages/store/buy","pages/order/index","pages/order/details","pages/address/index","pages/address/edit","pages/pay/pay","pages/store/list","pages/store/meals","pages/store/search","pages/refund/list","pages/refund/aftersale","pages/refund/refund_or_exchange_apply","pages/refund/exchange","pages/account/integral","pages/account/dt","pages/account/recharge","pages/vip/vip","pages/vip/agreement","pages/team/index","pages/store/shop/shopDetail","pages/store/shop/shopList"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"ZH健康","navigationBarBackgroundColor":"#F3F6FB","backgroundColorTop":"#F3F6FB","backgroundColorBottom":"#F3F6FB"},"tabBar":{"borderStyle":"white","selectedColor":"#34CE98","list":[{"iconPath":"static/tabBar/tabBar_02.png","selectedIconPath":"static/tabBar/tabBar_show_02.png","pagePath":"pages/life/life","text":"共力人生"},{"iconPath":"static/tabBar/tabBar_02.png","selectedIconPath":"static/tabBar/tabBar_show_02.png","pagePath":"pages/store/index","text":"DT商城"},{"iconPath":"static/tabBar/tabBar_03.png","selectedIconPath":"static/tabBar/tabBar_show_03.png","pagePath":"pages/user/index","text":"我的"}]},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"ZH-HEALTH","compilerVersion":"3.3.11","entryPagePath":"pages/auth/auth","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/auth/auth","meta":{"isQuit":true},"window":{"navigationBarTitleText":"登录","navigationStyle":"custom"}},{"path":"/pages/auth/role","meta":{},"window":{"navigationBarTitleText":"角色创建","navigationBarBackgroundColor":"#FFF","titleNView":{"buttons":[{"text":"退出登录","fontSize":"14","width":"80px","color":"#34CE98"}]}}},{"path":"/pages/life/life","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"共力人生","navigationStyle":"custom"}},{"path":"/pages/store/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"DT商城","enablePullDownRefresh":true,"titleNView":{"backgroundColor":"#FFFFFF","buttons":[{"float":"right","text":"","fontSrc":"/static/iconfont.ttf","color":"#000","fontSize":"20px"}]}}},{"path":"/pages/user/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/setting/setting","meta":{},"window":{"navigationBarTitleText":"设置中心","navigationBarBackgroundColor":"#34CE98","navigationBarTextStyle":"white"}},{"path":"/pages/store/goods","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"详情","titleNView":{"backgroundColor":"#FFFFFF","type":"transparent"}}},{"path":"/pages/store/buy","meta":{},"window":{"navigationBarTitleText":"确认订单","enablePullDownRefresh":false}},{"path":"/pages/order/index","meta":{},"window":{"navigationBarTitleText":"我的订单","navigationBarBackgroundColor":"#FFFFFF","enablePullDownRefresh":false}},{"path":"/pages/order/details","meta":{},"window":{"navigationBarTitleText":"订单详情","enablePullDownRefresh":false}},{"path":"/pages/address/index","meta":{},"window":{"navigationBarTitleText":"收货地址"}},{"path":"/pages/address/edit","meta":{},"window":{"navigationBarTitleText":"编辑","enablePullDownRefresh":false}},{"path":"/pages/pay/pay","meta":{},"window":{"navigationBarTitleText":"收银台","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/store/list","meta":{},"window":{"navigationBarTitleText":"商品","navigationBarBackgroundColor":"#FFFFFF","enablePullDownRefresh":true}},{"path":"/pages/store/meals","meta":{},"window":{"navigationBarTitleText":"套餐","navigationBarBackgroundColor":"#FFFFFF","enablePullDownRefresh":true}},{"path":"/pages/store/search","meta":{},"window":{"navigationBarTitleText":"搜索","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/refund/list","meta":{},"window":{"navigationBarTitleText":"退换货","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/refund/aftersale","meta":{},"window":{"navigationBarTitleText":" 选择售后类型","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/refund/refund","meta":{},"window":{"navigationBarTitleText":"退货","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/refund/exchange","meta":{},"window":{"navigationBarTitleText":"换货","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/account/integral","meta":{},"window":{"navigationBarTitleText":"共力值","navigationBarBackgroundColor":"#34CE98","navigationBarTextStyle":"white"}},{"path":"/pages/account/dt","meta":{},"window":{"navigationBarTitleText":"DT积分","navigationBarBackgroundColor":"#34CE98","backgroundColorTop":"#34CE98","navigationBarTextStyle":"white","titleNView":{"buttons":[{"text":"充值","width":"60","fontSize":"14"}]}}},{"path":"/pages/account/recharge","meta":{},"window":{"navigationBarTitleText":"DT积分充值","navigationBarBackgroundColor":"#FFFFFF","titleNView":{"buttons":[{"text":"充值记录","width":"80","fontSize":"14"}]}}},{"path":"/pages/vip/vip","meta":{},"window":{"navigationBarTitleText":"共力会员","navigationBarBackgroundColor":"#242430","navigationBarTextStyle":"white","backgroundColorTop":"#242430"}},{"path":"/pages/vip/agreement","meta":{},"window":{"navigationBarTitleText":"共力会员协议"}},{"path":"/pages/team/index","meta":{},"window":{"navigationBarTitleText":"共力团队","enablePullDownRefresh":false}},{"path":"/pages/store/shop/shopDetail","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/store/shop/shopList","meta":{},"window":{"navigationBarTitleText":"更多店铺","navigationBarBackgroundColor":"#FFFFFF","enablePullDownRefresh":true}}];
+var __uniRoutes = [{"path":"/pages/auth/auth","meta":{"isQuit":true},"window":{"navigationBarTitleText":"登录","navigationStyle":"custom"}},{"path":"/pages/auth/role","meta":{},"window":{"navigationBarTitleText":"角色创建","navigationBarBackgroundColor":"#FFF","titleNView":{"buttons":[{"text":"退出登录","fontSize":"14","width":"80px","color":"#34CE98"}]}}},{"path":"/pages/life/life","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"共力人生","navigationStyle":"custom"}},{"path":"/pages/store/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"DT商城","enablePullDownRefresh":true,"titleNView":{"backgroundColor":"#FFFFFF","buttons":[{"float":"right","text":"","fontSrc":"/static/iconfont.ttf","color":"#000","fontSize":"20px"}]}}},{"path":"/pages/user/index","meta":{"isQuit":true,"isTabBar":true},"window":{"navigationBarTitleText":"我的","navigationStyle":"custom"}},{"path":"/pages/setting/setting","meta":{},"window":{"navigationBarTitleText":"设置中心","navigationBarBackgroundColor":"#34CE98","navigationBarTextStyle":"white"}},{"path":"/pages/store/goods","meta":{},"window":{"navigationStyle":"custom","navigationBarTitleText":"详情","titleNView":{"backgroundColor":"#FFFFFF","type":"transparent"}}},{"path":"/pages/store/buy","meta":{},"window":{"navigationBarTitleText":"确认订单","enablePullDownRefresh":false}},{"path":"/pages/order/index","meta":{},"window":{"navigationBarTitleText":"我的订单","navigationBarBackgroundColor":"#FFFFFF","enablePullDownRefresh":false}},{"path":"/pages/order/details","meta":{},"window":{"navigationBarTitleText":"订单详情","enablePullDownRefresh":false}},{"path":"/pages/address/index","meta":{},"window":{"navigationBarTitleText":"收货地址"}},{"path":"/pages/address/edit","meta":{},"window":{"navigationBarTitleText":"编辑","enablePullDownRefresh":false}},{"path":"/pages/pay/pay","meta":{},"window":{"navigationBarTitleText":"收银台","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/store/list","meta":{},"window":{"navigationBarTitleText":"商品","navigationBarBackgroundColor":"#FFFFFF","enablePullDownRefresh":true}},{"path":"/pages/store/meals","meta":{},"window":{"navigationBarTitleText":"套餐","navigationBarBackgroundColor":"#FFFFFF","enablePullDownRefresh":true}},{"path":"/pages/store/search","meta":{},"window":{"navigationBarTitleText":"搜索","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/refund/list","meta":{},"window":{"navigationBarTitleText":"退换货","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/refund/aftersale","meta":{},"window":{"navigationBarTitleText":" 选择售后类型","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/refund/refund_or_exchange_apply","meta":{},"window":{"navigationBarTitleText":"退换货申请","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/refund/exchange","meta":{},"window":{"navigationBarTitleText":"换货","navigationBarBackgroundColor":"#FFFFFF"}},{"path":"/pages/account/integral","meta":{},"window":{"navigationBarTitleText":"共力值","navigationBarBackgroundColor":"#34CE98","navigationBarTextStyle":"white"}},{"path":"/pages/account/dt","meta":{},"window":{"navigationBarTitleText":"DT积分","navigationBarBackgroundColor":"#34CE98","backgroundColorTop":"#34CE98","navigationBarTextStyle":"white","titleNView":{"buttons":[{"text":"充值","width":"60","fontSize":"14"}]}}},{"path":"/pages/account/recharge","meta":{},"window":{"navigationBarTitleText":"DT积分充值","navigationBarBackgroundColor":"#FFFFFF","titleNView":{"buttons":[{"text":"充值记录","width":"80","fontSize":"14"}]}}},{"path":"/pages/vip/vip","meta":{},"window":{"navigationBarTitleText":"共力会员","navigationBarBackgroundColor":"#242430","navigationBarTextStyle":"white","backgroundColorTop":"#242430"}},{"path":"/pages/vip/agreement","meta":{},"window":{"navigationBarTitleText":"共力会员协议"}},{"path":"/pages/team/index","meta":{},"window":{"navigationBarTitleText":"共力团队","enablePullDownRefresh":false}},{"path":"/pages/store/shop/shopDetail","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/store/shop/shopList","meta":{},"window":{"navigationBarTitleText":"更多店铺","navigationBarBackgroundColor":"#FFFFFF","enablePullDownRefresh":true}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});