duanqichao 4 vuotta sitten
vanhempi
commit
c613fa6541

+ 168 - 0
components/scan_code/index/coupon.vue

xqd
@@ -0,0 +1,168 @@
+<template>
+    <app-layout>
+        <view class="coupon-head-btn">
+            <app-button @click="pickCoupon(0)" color="#999999" background="#FFFFFF" round>不使用优惠券</app-button>
+        </view>
+        <view class="coupon-box">
+            <view class="coupon-item-container" v-for="(v,k) in list" :key="k">
+                <app-form-id @click="pickCoupon(v)">
+                    <view class="coupon-item">
+                        <image :src="appImg.coupon_enable_bg" class="coupon-bg"></image>
+                        <view class="dir-left-nowrap">
+                            <view class="box-grow-0 cross-center box-left">
+                                <view class="box-discount">
+                                    <view v-if="v.type==1">{{v.discount}}折</view>
+                                    <view v-if="v.type==2">¥{{v.sub_price}}</view>
+                                    <view class="box-use">满{{v.coupon_min_price}}可用</view>
+                                </view>
+                            </view>
+                            <view class="box-grow-1 cross-center coupon-right">
+                                <view>
+                                    <view class="coupon-name t-omit">{{v.coupon_data.name}}</view>
+                                    <view class="box-time">
+                                        <view>{{v.start_time}}~{{v.end_time}}</view>
+                                    </view>
+                                    <view>仅限当面付活动使用</view>
+                                </view>
+                                <icon v-if="coupon_id == v.id" class="icon-coupon-select"></icon>
+                            </view>
+                        </view>
+                    </view>
+                </app-form-id>
+            </view>
+        </view>
+    </app-layout>
+</template>
+
+<script>
+    import {mapState} from 'vuex';
+
+    export default {
+        name: "coupon",
+        components: {},
+        computed: {
+            ...mapState({
+                appImg: state => state.mallConfig.__wxapp_img.mall,
+            }),
+        },
+        data() {
+            return {
+                list: [],
+                page_loading: true,
+                coupon_id: 0,
+                price: '',
+            }
+        },
+        onLoad(options) {
+            const self = this;
+            [self.coupon_id, self.price] = [options.coupon_id, options.price];
+            self.$showLoading({text: '加载中'});
+            self.$request({
+                url: self.$api.scan_code_pay.coupons,
+                data: {
+                    price: options.price,
+                },
+                method: 'post',
+            }).then(e => {
+                self.$hideLoading();
+                if (e.code === 0) {
+                    self.list = e.data.coupon_list;
+                } else {
+                    uni.showToast({icon: 'none', title: e.msg});
+                }
+            }).catch(e => {
+                self.$hideLoading();
+            });
+        },
+        methods: {
+            pickCoupon(userCoupon) {
+                this.$store.commit('scanCode/mutSetUserCoupon', userCoupon);
+                uni.navigateBack({delta: 1});
+            },
+        }
+    }
+</script>
+
+<style lang="scss">
+    page {
+        background: #fff;
+    }
+</style>
+<style scoped lang="scss">
+    .coupon-head-btn {
+        padding: #{24rpx};
+    }
+
+    .coupon-box {
+        padding: #{24rpx} #{34rpx} 0 #{34rpx};
+
+        .box-left {
+            height: #{152rpx};
+            position: relative;
+            .box-discount {
+                text-align: center;
+                color: #fff;
+                width: #{194rpx};
+            }
+
+            .box-use {
+                font-size: #{20rpx};
+                padding-top: #{16rpx};
+            }
+        }
+    }
+
+    .coupon-item-container {
+        margin-bottom: #{24rpx};
+    }
+
+    .coupon-item-container:last-child {
+        margin-bottom: 0;
+    }
+
+    .coupon-item {
+        position: relative;
+        overflow: hidden;
+    }
+
+    .coupon-bg {
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 0;
+    }
+
+    .coupon-right {
+        position: relative;
+    }
+
+    .coupon-right > view {
+        padding: 0 #{30rpx};
+        overflow: hidden;
+        color: #666666;
+        font-size: #{20rpx};
+    }
+
+    .coupon-right .icon-coupon-select {
+        position: absolute;
+        right: 0;
+        top: 0;
+        height: #{70rpx};
+        width: #{70rpx};
+        z-index: 1;
+        background-image: url("../../../static/image/icon/coupon-select.png");
+        background-size: 100% auto;
+        background-repeat: no-repeat;
+    }
+
+    .coupon-right .box-time {
+        padding: #{12rpx} 0;
+    }
+
+    .coupon-right .coupon-name {
+        color: #353535;
+        font-size: #{32rpx};
+    }
+</style>

+ 561 - 0
components/scan_code/index/index.vue

xqd
@@ -0,0 +1,561 @@
+<template>
+    <app-layout>
+        <view>
+            <view class="scan-head dir-top-nowrap main-center">
+                <view class="order-name">订单金额</view>
+                <view class="scan-price dir-left-nowrap cross-bottom" @click="openPriceModel">
+                    <view class="order-key">¥</view>
+                    <view class="order-value">{{list.price}}</view>
+                </view>
+                <view class="scan-line"></view>
+                <!-- 优惠 -->
+                <view class="dir-left-nowrap cross-center scan-offer">
+                    <view class="box-grow-1">订单优惠</view>
+                    <view class="box-grow-0">
+                        <view v-if="list.preferential_money > 0" class="red">
+                            -¥{{list.preferential_money}}
+                        </view>
+                        <view v-else-if="list.price > 0" class="gray">暂无优惠</view>
+                    </view>
+                </view>
+
+                <!-- 优惠券 -->
+                <view class="dir-left-nowrap cross-center scan-offer">
+                    <view class="box-grow-1">优惠劵</view>
+                    <view class="box-grow-0 coupon-right">
+                        <view v-if="list.coupon_id" @click="setCoupon" class="red">
+                            -¥{{list.coupon_preferential_money}}
+                        </view>
+                        <view v-else-if="list.price > 0 && list.can_coupon_num > 0" class="gray"
+                              @click="setCoupon">选择优惠券
+                        </view>
+                        <view v-else-if="list.price > 0" class="gray">暂无可用优惠券</view>
+                    </view>
+                    <view class="box-grow-0 cross-center">
+                        <icon class="icon-right"></icon>
+                    </view>
+                </view>
+                <!-- 积分抵扣 -->
+                <view v-if="list.price > 0 && activity && integral.user_integral_num >= integral.member_integral && list.integral_deduction > 0"
+                      class="dir-left-nowrap cross-center scan-offer">
+                    <view class="box-grow-1 cross-center dir-left-nowrap">
+                        <view>
+                            <text>使用{{list.use_integral_num}}积分抵扣</text>
+                            <text class="red">{{list.integral_deduction}}</text>
+                            <text>元</text>
+                        </view>
+                        <view @click="getIntegralInfo" class="main-center cross-center">
+                            <icon class="scan-integral-icon"></icon>
+                        </view>
+                    </view>
+                    <view class="box-grow-0" @click="handleUseIntegral">
+                        <icon v-if="list.use_integral == 1" class="scan-integral-switch check"></icon>
+                        <icon v-else class="scan-integral-switch uncheck"></icon>
+                    </view>
+                </view>
+
+                <!-- 备注 -->
+                <view class="dir-left-nowrap scan-offer">
+                    <input @input="bindTextBlur" :value="remark" class="scan-input" placeholder="添加备注"/>
+                </view>
+                <view class="scan-line"></view>
+                <view class="scan-remark cross-center dir-left-nowrap main-center">
+                    <view class="key">应付金额</view>
+                    <view class="value">¥{{list.pay_price}}</view>
+                </view>
+            </view>
+
+            <view class="main-center cross-center scan-btn">
+                <app-button @click="submit"
+                            color="#ffffff"
+                            font-size="32"
+                            height="88"
+                            width="702"
+                            :background="list.price > 0 ? '#ff4544': '#cdcdcd'"
+                            :disabled="list.price <= 0"
+                            round>已与店员确认,立即买单
+                </app-button>
+            </view>
+            <view class="scan-end" v-if="activity.rules">
+                <view class="dir-left-nowrap cross-center">
+                    <view class="icon"></view>
+                    <view>规则说明</view>
+                </view>
+                <text space="nbsp">{{activity.rules}}</text>
+            </view>
+        </view>
+
+        <!-- MODEL -->
+        <view v-if="price_modal" class="scan-modal show bt">
+            <view class="scan-modal-bg"></view>
+            <view class="scan-modal-pic main-center">
+                <view class="info-model cross-center dir-top-nowrap">
+                    <view class="order-title">订单金额</view>
+                    <view class="info-box dir-left-nowrap cross-center">
+                        <input focus class="info-input" @input="setTempInput" :value="tmp_price" type="digit"
+                               placeholder-class="place" placeholder="输入支付金额"/>
+                        <view>元</view>
+                    </view>
+                    <view class="info-end dir-left-nowrap cross-center">
+                        <view @click="closePriceModel" class="box-grow-1 main-center cross-center">取消</view>
+                        <view class="box-grow-0 info-line"></view>
+                        <view @click="calcPrice" class="box-grow-1 red main-center cross-center">确认</view>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </app-layout>
+</template>
+
+<script>
+    export default {
+        name: "index",
+        components: {},
+        data() {
+            return {
+                page_loading: true,
+                tmp_price: '',
+                edit_status: true,
+                price_modal: false,
+                activity: null,
+                remark: '',
+                integral: {
+                    user_integral_num: '0',
+                },
+                list: {
+                    price: '',
+                    pay_price: 0.00,
+                    use_integral: 0,
+                    activity_id: 0,
+                    coupon_id: 0,
+                    can_coupon_num: 0,
+                    integral_explain: [],
+                },
+                clear: false,
+            }
+        },
+        onShow: function () {
+            const self = this;
+            const userCoupon = self.$store.state.scanCode.userCoupon;
+            if (userCoupon) {
+                self.list.coupon_id = userCoupon.id;
+                self.calcPrice();
+            } else {
+                self.list.coupon_id = 0
+            }
+            if (self.clear) {
+                console.log('onShow => clear');
+                [
+                    self.edit_status,
+                    self.clear,
+                    self.remark,
+                    self.tmp_price,
+                    self.list,
+                ] = [
+                    true,
+                    false,
+                    '',
+                    '',
+                    {
+                        price: '',
+                        pay_price: 0.00,
+                        use_integral: 0,
+                        activity_id: 0,
+                        coupon_id: 0,
+                        can_coupon_num: 0,
+                        integral_explain: [],
+                    }
+                ]
+            }
+        },
+
+        onLoad: function (options) {
+            const self = this;
+            if (options.price) {
+                [self.edit_status, self.tmp_price] = [false, options.price];
+                self.calcPrice();
+            }
+            self.$showLoading({text: '加载中'});
+            self.$request({
+                url: self.$api.scan_code_pay.index
+            }).then(info => {
+                self.$hideLoading();
+                if (info.code === 0) {
+                    [
+                        self.activity,
+                        self.goods,
+                        self.integral,
+                        self.setting
+                    ] = [
+                        info.data.activity,
+                        info.data.goods,
+                        info.data.integral,
+                        info.data.setting
+                    ];
+                }
+            }).catch(info => {
+                self.$hideLoading();
+            })
+        },
+        methods: {
+            openPriceModel() {
+                if (!this.edit_status) return;
+                this.price_modal = true;
+            },
+            closePriceModel() {
+                this.price_modal = false;
+            },
+            setTempInput: function (e) {
+                this.tmp_price = e.detail.value;
+            },
+            //总价
+            calcPrice: function () {
+                const self = this;
+                self.price_modal = false;
+                self.$showLoading({text: '加载中'});
+
+                self.$request({
+                    url: self.$api.scan_code_pay.preview,
+                    data: {
+                        price: self.tmp_price,
+                        coupon_id: self.list.coupon_id,
+                        use_integral: self.list.use_integral,
+                    },
+                    method: 'POST',
+                }).then(info => {
+                    self.$hideLoading();
+                    if (info.code === 0) {
+                        [self.list, self.tmp_price] = [info.data, info.data.price];
+                    } else {
+                        uni.showToast({icon: 'none', title: info.msg});
+                    }
+                }).catch(info => {
+                    self.$hideLoading();
+                })
+            },
+
+            //UseIntegral
+            handleUseIntegral() {
+                const self = this;
+                let list = self.list;
+                list.use_integral = list.use_integral == 1 ? 0 : 1;
+                self.calcPrice();
+            },
+
+            //Remark
+            bindTextBlur: function (e) {
+                this.remark = e.detail.value;
+            },
+
+            //Integral
+            getIntegralInfo: function (e) {
+                let content = '';
+                this.list.integral_explain.map(v => {
+                    content += '消费满' + v.consume_money + '元,';
+                    content += '积分最多可抵' + v.integral_deduction + '元';
+                    content += '\r\n';
+                });
+                uni.showModal({
+                    title: '积分抵扣说明',
+                    content: content.trim(),
+                    showCancel: false
+                })
+            },
+
+            //navigate
+            setCoupon: function (e) {
+                this.clear = false;
+                uni.navigateTo({
+                    url: '/plugins/scan_code/index/coupon?price=' + this.list.price + '&coupon_id=' + this.list.coupon_id,
+                });
+            },
+
+            submit: function (e) {
+                const self = this;
+                if (!self.list.price) return
+
+                self.$showLoading({text: '正在提交'});
+                self.$request({
+                    url: self.$api.scan_code_pay.submit,
+                    method: 'post',
+                    data: {
+                        price: self.list.price,
+                        coupon_id: self.list.coupon_id,
+                        use_integral: self.list.use_integral,
+                        remark: self.remark,
+                    },
+                }).then(e => {
+                    self.$hideLoading();
+                    if (e.code === 0) {
+                        self.$payment.pay(e.data.pay_id).then(payMsg => {
+                            // 支付成功
+                            uni.showModal({
+                                title: '提示',
+                                content: "支付成功",
+                                showCancel: false,
+                                success() {
+                                    uni.navigateTo({
+                                        url: '/pages/order-submit/pay-result?payment_order_union_id=' + e.data.pay_id + '&plugin=scan_code_pay'
+                                    })
+                                    self.clear = true;
+                                },
+                            });
+                        }).catch(payMsg => {
+                            // 支付失败
+                            self.$showLoading({text: '取消中'});
+                            self.$request({
+                                url: self.$api.scan_code_pay.cancel,
+                                data: {
+                                    pay_id: e.data.pay_id,
+                                },
+                                method: 'POST',
+                            }).then(info => {
+                                self.$hideLoading();
+                            }).catch(info => {
+                                self.$hideLoading();
+                                uni.showModal({title: '提示', content: info.msg});
+                            })
+                        });
+                    } else {
+                        uni.showModal({title: '提示', content: info.msg});
+                    }
+                }).catch(e => {
+                    self.$hideLoading();
+                });
+            },
+        }
+    }
+</script>
+
+<style scoped lang="scss">
+    .red {
+        color: #ff4544;
+    }
+
+    .gray {
+        color: #999999;
+    }
+
+    .scan-head {
+        margin: #{20rpx} #{24rpx} 0 #{24rpx};
+        background: #fff;
+        border-radius: #{16rpx};
+        padding: #{48rpx} #{40rpx} 0 #{40rpx};
+        font-size: #{28rpx};
+        color: #353535;
+
+        .scan-line {
+            height: 1px;
+            margin-top: #{38rpx};
+            background: #e2e2e2;
+        }
+
+        .scan-price {
+            margin-top: #{32rpx};
+
+            .order-key {
+                font-size: #{50rpx};
+            }
+
+            .order-value {
+                font-size: #{80rpx};
+                padding-left: #{28rpx};
+                height: #{98rpx};
+            }
+        }
+    }
+
+    .scan-offer {
+        color: #666666;
+        font-size: #{28rpx};
+        margin-top: #{40rpx};
+
+        .coupon-right {
+            padding-right: #{12rpx};
+        }
+
+        .icon-right {
+            background-size: 100% auto;
+            background-repeat: no-repeat;
+            background-image: url("../../../static/image/icon/arrow-right.png");
+            width: #{12rpx};
+            height: #{22rpx};
+        }
+    }
+
+    .scan-integral-icon {
+        height: #{36rpx};
+        width: #{36rpx};
+        background-image: url("../../../static/image/icon/warning.png");
+        background-repeat: no-repeat;
+        background-size: 100% auto;
+        margin-left: #{20rpx};
+    }
+
+    .scan-integral-switch {
+        width: #{44rpx};
+        height: #{44rpx};
+        background-size: 100% auto;
+        background-repeat: no-repeat;
+        float: left;
+
+    }
+
+    .scan-integral-switch.check {
+        margin-left: #{5rpx};
+        background-image: url("../../../static/image/icon/icon-checkbox-checked-a.png");
+    }
+
+    .scan-integral-switch.uncheck {
+        margin-left: #{5rpx};
+        background-image: url("../../../static/image/icon/icon-uncheck.png");
+    }
+
+    .scan-input {
+        width: 100%;
+        font-size: #{28rpx};
+        color: #666;
+    }
+
+    .scan-remark {
+        height: #{106rpx};
+
+        .key {
+            margin-left: auto;
+            color: #353535;
+            font-size: #{28rpx};
+        }
+
+        .value {
+            margin-left: #{10rpx};
+            color: #ff4544;
+            font-size: #{36rpx};
+        }
+    }
+
+    .scan-end {
+        color: #666;
+        background: #fff;
+        margin: 0 #{24rpx};
+        font-size: #{28rpx};
+        border-radius: #{16rpx};
+        padding: #{40rpx};
+
+        text {
+            word-break: break-all;
+            text-align: justify;
+        }
+    }
+
+    .scan-end > view {
+        margin-bottom: #{12rpx};
+    }
+
+    .scan-end .icon {
+        height: #{26rpx};
+        width: #{8rpx};
+        border-radius: #{4rpx};
+        background: #ff4544;
+        margin-right: #{16rpx};
+    }
+
+    .scan-btn {
+        margin: #{40rpx} auto;
+    }
+
+    .scan-modal {
+        position: fixed;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 2001;
+        transition: 200ms;
+    }
+
+    .scan-modal.show {
+        visibility: visible;
+        opacity: 1;
+    }
+
+    .scan-modal.bt {
+        -webkit-animation-name: fadeIn; /*动画名称*/
+        -webkit-animation-duration: 0.25s; /*动画持续时间*/
+        -webkit-animation-iteration-count: 1; /*动画次数*/
+        -webkit-animation-delay: 0s; /*延迟时间*/
+    }
+
+    .scan-modal .scan-modal-bg {
+        background: rgba(0, 0, 0, 0.8);
+        position: fixed;
+        left: 0;
+        top: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 1;
+    }
+
+    .scan-modal .scan-modal-pic {
+        position: fixed;
+        left: 0;
+        top: #{188rpx};
+        width: 100%;
+        height: 100%;
+        z-index: 1;
+    }
+
+    .scan-modal .scan-modal-close image {
+        width: #{50rpx};
+        height: #{50rpx};
+        margin-top: #{50rpx};
+    }
+
+    .scan-modal .info-model {
+        height: #{360rpx};
+        width: #{620rpx};
+        background: #fff;
+        border-radius: #{16rpx};
+    }
+
+    .scan-modal .order-title {
+        margin: #{48rpx} 0
+    }
+
+    .scan-modal .place {
+        color: #cdcdcd
+    }
+
+    .scan-modal .info-box {
+        height: #{88rpx};
+        width: #{400rpx};
+        margin-bottom: #{48rpx};
+        border-radius: #{8rpx};
+        padding: 0 #{24rpx};
+        border: 1px solid #e2e2e2;
+    }
+
+    .scan-modal .info-input {
+        font-size: #{32rpx};
+        color: #353535;
+    }
+
+    .scan-modal .info-line {
+        height: #{32rpx} !important;
+        width: 1px !important;
+        background: #e2e2e2;
+    }
+
+    .scan-modal .info-end {
+        color: #666666;
+        height: #{88rpx};
+        font-size: #{32rpx};
+        border-top: #{1rpx} solid #e2e2e2;
+        width: 100%;
+    }
+
+    .scan-modal .info-end view {
+        height: 100%;
+        width: 100%;
+    }
+
+</style>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
pages/coupon-list/coupon-list.wxml


+ 1 - 0
pages/coupon-list/coupon-list.wxss

xqd
@@ -4,3 +4,4 @@
 .info-content { height: 160rpx; width: 100%; color: #fff; padding: 0 24rpx; line-height: 1; position: relative; }
 .info-btn { background-color: #fff; width: 160rpx; height: 56rpx; border-radius: 28rpx; }
 .info-footer { background-color: #fff; padding: 24rpx 24rpx 32rpx 24rpx; border-radius: 0 0 16rpx 16rpx; border: 1rpx solid #cfcfcf; border-top: none; color: #666; }
+.couponName{font-size: 21rpx;padding: 20rpx 0;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}

+ 20 - 0
pages/index/index.js

xqd
@@ -229,5 +229,25 @@ Page({
   },
   fullscreenchange: function(t) {
     fullScreen = !!t.detail.fullScreen
+  },
+  shuoming: function () {
+    getApp().core.navigateTo({
+      url: "/pages/integral-mall/shuoming/index"
+    })
+  },
+  exchange: function () {
+    getApp().core.navigateTo({
+      url: "/pages/integral-mall/exchange/index"
+    })
+  },
+  detail: function () {
+    getApp().core.navigateTo({
+      url: "/pages/integral-mall/detail/index"
+    })
+  },
+  register: function () {
+    getApp().core.navigateTo({
+      url: "/pages/integral-mall/register/index"
+    })
   }
 });

+ 2 - 2
pages/index/index.wxml

xqd
@@ -92,13 +92,13 @@
             <template is='diy-{{item.type}}' data='{{param:item.param,__wxapp_img:__wxapp_img,show_notice:show_notice,play:play,time_all:time_all,template_index:index}}'></template>
           </block>
           <block wx:elif='{{item.type == "float"}}'>
-            <block wx:if='{{item.param.style == 0}}'>
+<!--            <block wx:if='{{item.param.style == 0}}'>
               <app-navigation __alipay_mp_config='{{__alipay_mp_config}}' __device='{{__device}}' __platform='{{__platform}}' __user_info='{{__user_info}}' home_icon='{{home_icon}}' options='{{options}}' setnavi='{{setnavi}}' store='{{store}}'></app-navigation>
             </block>
             <block wx:else>
               <app-navigation __alipay_mp_config='{{__alipay_mp_config}}' __device='{{__device}}' __platform='{{__platform}}' __user_info='{{__user_info}}' click_pic='{{item.param.click_pic}}' home_icon='true' options='{{options}}' setnavi='{{item.param.setnavi}}'
                 store='{{item.param.store}}'></app-navigation>
-            </block>
+            </block> -->
           </block>
           <block wx:else>
             <template is='{{item.type}}' data='{{param:item.param,__wxapp_img:__wxapp_img,show_notice:show_notice,play:play,time_all:time_all,template_index:index,coupon_index:"true",type:item.type}}'></template>

+ 4 - 1
pages/test/index.wxml

xqd xqd
@@ -1,4 +1,4 @@
-<view class="content">
+<!-- <view class="content">
       <image src="http://dm.dhcarlife.com/core/image/store_21320/279eb5c66200a6002e835db916f0b8c3769aee1f.jpg" 
        data-src="http://dm.dhcarlife.com/core/image/store_21320/279eb5c66200a6002e835db916f0b8c3769aee1f.jpg"
        data-from="content"
@@ -16,4 +16,7 @@
       data-src="https://dm.dhcarlife.com/core/image/store_21320/838f57c6c943dfabf5cdca836638df00a5e3f6e0.jpg" 
       data-from="content"
     bindtap="wxParseImgTap" mode='widthFix' style="width:100%;"></image>
+</view> -->
+<view class="content">
+	
 </view>

+ 114 - 98
project.config.json

xqd
@@ -1,100 +1,116 @@
 {
-	"description": "项目配置文件",
-	"packOptions": {
-		"ignore": []
-	},
-	"setting": {
-		"urlCheck": false,
-		"es6": true,
-		"postcss": true,
-		"preloadBackgroundData": false,
-		"minified": true,
-		"newFeature": true,
-		"coverView": true,
-		"autoAudits": false,
-		"showShadowRootInWxmlPanel": true,
-		"scopeDataCheck": false,
-		"checkInvalidKey": true,
-		"checkSiteMap": true,
-		"uploadWithSourceMap": true,
-		"babelSetting": {
-			"ignore": [],
-			"disablePlugins": [],
-			"outputPath": ""
-		},
-		"useCompilerModule": true,
-		"userConfirmedUseCompilerModuleSwitch": false
-	},
-	"compileType": "miniprogram",
-	"libVersion": "2.10.1",
-	"appid": "wx479e4b6f1f891a50",
-	"projectname": "%E5%8D%A1%E5%8C%85",
-	"debugOptions": {
-		"hidedInDevtools": []
-	},
-	"isGameTourist": false,
-	"simulatorType": "wechat",
-	"simulatorPluginLibVersion": {},
-	"condition": {
-		"search": {
-			"current": -1,
-			"list": []
-		},
-		"conversation": {
-			"current": -1,
-			"list": []
-		},
-		"plugin": {
-			"current": -1,
-			"list": []
-		},
-		"game": {
-			"currentL": -1,
-			"list": []
-		},
-		"gamePlugin": {
-			"current": -1,
-			"list": []
-		},
-		"miniprogram": {
-			"current": -1,
-			"list": [
-				{
-					"id": -1,
-					"name": "pages/goods/goods",
-					"pathName": "pages/goods/goods",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/order-detail/order-detail",
-					"pathName": "pages/order-detail/order-detail",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/test/index",
-					"pathName": "pages/test/index",
-					"query": "",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/index/index",
-					"pathName": "pages/index/index",
-					"query": "page_id=7",
-					"scene": null
-				},
-				{
-					"id": 4,
-					"name": "pages/index/index",
-					"pathName": "pages/index/index",
-					"query": "page_id=8",
-					"scene": null
-				}
-			]
-		}
-	}
+  "description": "项目配置文件",
+  "packOptions": {
+    "ignore": []
+  },
+  "setting": {
+    "urlCheck": false,
+    "es6": true,
+    "enhance": false,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": true,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "useMultiFrameRuntime": false,
+    "useApiHook": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "useIsolateContext": true,
+    "useCompilerModule": true,
+    "userConfirmedUseCompilerModuleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": []
+  },
+  "compileType": "miniprogram",
+  "libVersion": "2.10.1",
+  "appid": "wx479e4b6f1f891a50",
+  "projectname": "%E5%8D%A1%E5%8C%85",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "isGameTourist": false,
+  "simulatorType": "wechat",
+  "simulatorPluginLibVersion": {},
+  "condition": {
+    "search": {
+      "current": -1,
+      "list": []
+    },
+    "conversation": {
+      "current": -1,
+      "list": []
+    },
+    "plugin": {
+      "current": -1,
+      "list": []
+    },
+    "game": {
+      "currentL": -1,
+      "list": []
+    },
+    "gamePlugin": {
+      "current": -1,
+      "list": []
+    },
+    "miniprogram": {
+      "current": -1,
+      "list": [
+        {
+          "id": -1,
+          "name": "pages/goods/goods",
+          "pathName": "pages/goods/goods",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/order-detail/order-detail",
+          "pathName": "pages/order-detail/order-detail",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/test/index",
+          "pathName": "pages/test/index",
+          "query": "",
+          "scene": null
+        },
+        {
+          "id": -1,
+          "name": "pages/index/index",
+          "pathName": "pages/index/index/",
+          "query": "page_id=7",
+          "scene": null
+        },
+        {
+          "id": 4,
+          "name": "pages/index/index",
+          "pathName": "pages/index/index",
+          "query": "page_id=8",
+          "scene": null
+        },
+        {
+          "id": 5,
+          "name": "pages/test/index",
+          "pathName": "pages/test/index",
+          "query": "",
+          "scene": null
+        }
+      ]
+    }
+  }
 }

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä