配送设置

src/App.vue

@@ -35,53 +35,53 @@ export default {
         console.log(user);
 
         // 判断用户是否验证团长号
-        if (user.roleId && user.bundleId !== 0) {
-        } else {
-            this.api
-                .get(
-                    "/Group/CheckCode",
-                    {
-                        platform: user.fromPlatform,
-                    },
-                    { pass: true }
-                )
-                .then((res) => {
-                    if (res.success) {
-                        if (res.data.verified) {
-                            // if (!res.data.storeId) {
-                            //     this.router.push({
-                            //         isTabBar: true,
-                            //         path: "/pages/assistant/index",
-                            //     });
-                            //     this.fn.setTabBar([3]);
-                            // } else {
-                            //     this.router.push({
-                            //         isTabBar: true,
-                            //         path: "/pages/index/index",
-                            //     });
-                            //     this.fn.setTabBar([1, 2]);
-                            // }
-                        } else {
-                            this.router.push({
-                                path: "/pages/index/register",
-                                query: {
-                                    pidCode: res.data.code,
-                                    step: 3,
-                                },
-                            });
-                            this.fn.setTabBar([3]);
-                        }
-                    } else {
-                        this.router.push({
-                            path: "/pages/index/register",
-                            query: {
-                                step: 2,
-                            },
-                        });
-                        this.fn.setTabBar([3]);
-                    }
-                });
-        }
+        // if (user.roleId && user.bundleId !== 0) {
+        // } else {
+        //     this.api
+        //         .get(
+        //             "/Group/CheckCode",
+        //             {
+        //                 platform: user.fromPlatform,
+        //             },
+        //             { pass: true }
+        //         )
+        //         .then((res) => {
+        //             if (res.success) {
+        //                 if (res.data.verified) {
+        //                     // if (!res.data.storeId) {
+        //                     //     this.router.push({
+        //                     //         isTabBar: true,
+        //                     //         path: "/pages/assistant/index",
+        //                     //     });
+        //                     //     this.fn.setTabBar([3]);
+        //                     // } else {
+        //                     //     this.router.push({
+        //                     //         isTabBar: true,
+        //                     //         path: "/pages/index/index",
+        //                     //     });
+        //                     //     this.fn.setTabBar([1, 2]);
+        //                     // }
+        //                 } else {
+        //                     this.router.push({
+        //                         path: "/pages/index/register",
+        //                         query: {
+        //                             pidCode: res.data.code,
+        //                             step: 3,
+        //                         },
+        //                     });
+        //                     this.fn.setTabBar([3]);
+        //                 }
+        //             } else {
+        //                 this.router.push({
+        //                     path: "/pages/index/register",
+        //                     query: {
+        //                         step: 2,
+        //                     },
+        //                 });
+        //                 this.fn.setTabBar([3]);
+        //             }
+        //         });
+        // }
     },
 
     onShow: async function (option) {

src/components/uni-steps/uni-steps.vue

@@ -0,0 +1,365 @@
+<template>
+    <view class="uni-steps">
+        <view
+            :class="[
+                direction === 'column' ? 'uni-steps__column' : 'uni-steps__row',
+            ]"
+        >
+            <view
+                :class="[
+                    direction === 'column'
+                        ? 'uni-steps__column-text-container'
+                        : 'uni-steps__row-text-container',
+                ]"
+            >
+                <view
+                    v-for="(item, index) in options"
+                    :key="index"
+                    :class="[
+                        direction === 'column'
+                            ? 'uni-steps__column-text'
+                            : 'uni-steps__row-text',
+                    ]"
+                >
+                    <text
+                        :style="{
+                            color:
+                                index <= active ? activeColor : deactiveColor,
+                        }"
+                        :class="[
+                            direction === 'column'
+                                ? 'uni-steps__column-title'
+                                : 'uni-steps__row-title',
+                        ]"
+                        >{{ item.title }}</text
+                    >
+                    <text
+                        :style="{
+                            color:
+                                index <= active ? activeColor : deactiveColor,
+                        }"
+                        :class="[
+                            direction === 'column'
+                                ? 'uni-steps__column-desc'
+                                : 'uni-steps__row-desc',
+                        ]"
+                        >{{ item.desc }}</text
+                    >
+                </view>
+            </view>
+            <view
+                :class="[
+                    direction === 'column'
+                        ? 'uni-steps__column-container'
+                        : 'uni-steps__row-container',
+                ]"
+            >
+                <view
+                    :class="[
+                        direction === 'column'
+                            ? 'uni-steps__column-line-item'
+                            : 'uni-steps__row-line-item',
+                    ]"
+                    v-for="(item, index) in options"
+                    :key="index"
+                >
+                    <view
+                        :class="[
+                            direction === 'column'
+                                ? 'uni-steps__column-line'
+                                : 'uni-steps__row-line',
+                            direction === 'column'
+                                ? 'uni-steps__column-line--before'
+                                : 'uni-steps__row-line--before',
+                        ]"
+                        :style="{
+                            backgroundColor:
+                                index <= active && index !== 0
+                                    ? activeColor
+                                    : index === 0
+                                    ? 'transparent'
+                                    : deactiveColor,
+                        }"
+                    ></view>
+                    <view
+                        :class="[
+                            direction === 'column'
+                                ? 'uni-steps__column-check'
+                                : 'uni-steps__row-check',
+                        ]"
+                        v-if="index === active"
+                    >
+                        <uni-icons
+                            :color="activeColor"
+                            type="checkbox-filled"
+                            size="14"
+                        ></uni-icons>
+                    </view>
+                    <view
+                        :class="[
+                            direction === 'column'
+                                ? 'uni-steps__column-circle'
+                                : 'uni-steps__row-circle',
+                        ]"
+                        v-else
+                        :style="{
+                            backgroundColor:
+                                index < active ? activeColor : deactiveColor,
+                        }"
+                    ></view>
+                    <view
+                        :class="[
+                            direction === 'column'
+                                ? 'uni-steps__column-line'
+                                : 'uni-steps__row-line',
+                            direction === 'column'
+                                ? 'uni-steps__column-line--after'
+                                : 'uni-steps__row-line--after',
+                        ]"
+                        :style="{
+                            backgroundColor:
+                                index < active && index !== options.length - 1
+                                    ? activeColor
+                                    : index === options.length - 1
+                                    ? 'transparent'
+                                    : deactiveColor,
+                        }"
+                    ></view>
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+/**
+ * Steps 步骤条
+ * @description 评分组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=34
+ * @property {Number} active 当前步骤
+ * @property {String} direction = [row|column] 当前步骤
+ * 	@value row 横向
+ * 	@value column 纵向
+ * @property {String} activeColor 选中状态的颜色
+ * @property {Array} options 数据源，格式为：[{title:'xxx',desc:'xxx'},{title:'xxx',desc:'xxx'}]
+ */
+
+export default {
+    name: "UniSteps",
+    props: {
+        direction: {
+            // 排列方向 row column
+            type: String,
+            default: "row",
+        },
+        activeColor: {
+            // 激活状态颜色
+            type: String,
+            default: "#1aad19",
+        },
+        deactiveColor: {
+            // 未激活状态颜色
+            type: String,
+            default: "#999999",
+        },
+        active: {
+            // 当前步骤
+            type: Number,
+            default: 0,
+        },
+        options: {
+            type: Array,
+            default() {
+                return [];
+            },
+        }, // 数据
+    },
+    data() {
+        return {};
+    },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "../../uni.scss";
+.uni-steps {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    width: 100%;
+    /* #endif */
+    /* #ifdef APP-NVUE */
+    flex: 1;
+    /* #endif */
+    flex-direction: column;
+}
+
+.uni-steps__row {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+}
+
+.uni-steps__column {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row-reverse;
+}
+
+.uni-steps__row-text-container {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+}
+
+.uni-steps__column-text-container {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+    flex: 1;
+}
+
+.uni-steps__row-text {
+    /* #ifndef APP-NVUE */
+    display: inline-flex;
+    /* #endif */
+    flex: 1;
+    flex-direction: column;
+}
+
+.uni-steps__column-text {
+    padding: 6px 0px;
+    border-bottom-style: solid;
+    border-bottom-width: 1px;
+    border-bottom-color: $uni-border-color;
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+}
+
+.uni-steps__row-title {
+    font-size: $uni-font-size-base;
+    line-height: 16px;
+    text-align: center;
+}
+
+.uni-steps__column-title {
+    font-size: $uni-font-size-base;
+    text-align: left;
+    line-height: 18px;
+}
+
+.uni-steps__row-desc {
+    font-size: 12px;
+    line-height: 14px;
+    text-align: center;
+}
+
+.uni-steps__column-desc {
+    font-size: $uni-font-size-sm;
+    text-align: left;
+    line-height: 18px;
+}
+
+.uni-steps__row-container {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: row;
+}
+
+.uni-steps__column-container {
+    /* #ifndef APP-NVUE */
+    display: inline-flex;
+    /* #endif */
+    width: 30px;
+    flex-direction: column;
+}
+
+.uni-steps__row-line-item {
+    /* #ifndef APP-NVUE */
+    display: inline-flex;
+    /* #endif */
+    flex-direction: row;
+    flex: 1;
+    height: 14px;
+    line-height: 14px;
+    align-items: center;
+    justify-content: center;
+}
+
+.uni-steps__column-line-item {
+    /* #ifndef APP-NVUE */
+    display: flex;
+    /* #endif */
+    flex-direction: column;
+    flex: 1;
+    align-items: center;
+    justify-content: center;
+}
+
+.uni-steps__row-line {
+    flex: 1;
+    height: 1px;
+    background-color: $uni-text-color-grey;
+}
+
+.uni-steps__column-line {
+    width: 1px;
+    background-color: $uni-text-color-grey;
+}
+
+.uni-steps__row-line--after {
+    transform: translateX(1px);
+}
+
+.uni-steps__column-line--after {
+    flex: 1;
+    transform: translate(0px, 1px);
+}
+
+.uni-steps__row-line--before {
+    transform: translateX(-1px);
+}
+
+.uni-steps__column-line--before {
+    height: 6px;
+    transform: translate(0px, -1px);
+}
+
+.uni-steps__row-circle {
+    width: 5px;
+    height: 5px;
+    border-radius: 100px;
+    background-color: $uni-text-color-grey;
+    margin: 0px 3px;
+}
+
+.uni-steps__column-circle {
+    width: 5px;
+    height: 5px;
+    border-radius: 100px;
+    background-color: $uni-text-color-grey;
+    margin: 4px 0px 5px 0px;
+}
+
+.uni-steps__row-check {
+    margin: 0px 6px;
+}
+
+.uni-steps__column-check {
+    height: 14px;
+    line-height: 14px;
+    margin: 2px 0px;
+}
+.uni-steps__row-check {
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    background-color: rgb(0, 188, 38);
+}
+</style>

src/pages.json

@@ -387,20 +387,44 @@
         {
             "path": "pages/custom/webview",
             "style": {
-                "navigationBarTitleText": ""
+                "navigationBarTitleText": "协议"
             }
         },
         {
-            "path": "pages/manage/points",
+            "path": "pages/manage/shop/points",
             "style": {
                 "navigationBarTitleText": "设置积分"
             }
         },
         {
-            "path": "pages/manage/set-shop",
+            "path": "pages/manage/shop/set-shop",
+            "style": {
+                "navigationBarTitleText": "基础设置"
+            }
+        },
+        {
+            "path": "pages/manage/shop/index",
             "style": {
                 "navigationBarTitleText": "店铺设置"
             }
+        },
+        {
+            "path": "pages/manage/shop/delivery",
+            "style": {
+                "navigationBarTitleText": "配送设置"
+            }
+        },
+        {
+            "path": "pages/guide/delivery",
+            "style": {
+                "navigationBarTitleText": "配送设置"
+            }
+        },
+        {
+            "path": "pages/wallet/index",
+            "style": {
+                "navigationBarTitleText": "提现管理"
+            }
         }
     ]
 }

src/pages/guide/delivery.vue

@@ -0,0 +1,438 @@
+<template>
+    <div class="page" :class="{ 'page--iphoneX': iphoneX }">
+        <div class="step">
+            <uni-steps
+                :options="[
+                    { title: '基础设置' },
+                    { title: '配送设置' },
+                    { title: '积分设置' },
+                ]"
+                :active="1"
+            ></uni-steps>
+        </div>
+        <div class="form-card">
+            <section class="form-item">
+                <div class="label">到店自提设置：</div>
+                <div class="box"></div>
+            </section>
+            <section class="form-item">
+                <div class="label">到店自提：</div>
+                <div class="box">
+                    <switch
+                        :value="true"
+                        :checked="form.ziti"
+                        @change="switchChange($event, 'ziti')"
+                    ></switch>
+                </div>
+            </section>
+            <section class="form-item" v-if="form.ziti">
+                <div class="label">最低自提下单金额：</div>
+                <div class="box">
+                    <input type="number" v-model="form.pointsMaxProportion" />
+                </div>
+                <div class="tool">元</div>
+            </section>
+
+            <section class="form-item">
+                <div class="label">送货上门设置：</div>
+                <div class="box"></div>
+            </section>
+            <section class="form-item">
+                <div class="label">送货上门：</div>
+                <div class="box">
+                    <switch
+                        :value="true"
+                        :checked="form.shangmen"
+                        @change="switchChange($event, 'shangmen')"
+                    ></switch>
+                </div>
+            </section>
+            <block v-if="form.shangmen">
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        最低送货下单金额：
+                    </div>
+                    <div class="box">
+                        <input
+                            type="number"
+                            v-model="form.inviteFriendRewardPoints"
+                        />
+                    </div>
+                    <div class="tool">元</div>
+                </section>
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        最远配送距离：
+                    </div>
+                    <div class="box">
+                        <input
+                            type="number"
+                            v-model="form.inviteFriendRewardPoints"
+                        />
+                    </div>
+                    <div class="tool">公里</div>
+                </section>
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        配送费：
+                    </div>
+                    <div class="box">
+                        <input
+                            type="digit"
+                            v-model="form.inviteFriendRewardPoints"
+                        />
+                    </div>
+                    <div class="tool">元</div>
+                </section>
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        打包费：
+                    </div>
+                    <div class="box">
+                        <input
+                            type="digit"
+                            v-model="form.inviteFriendRewardPoints"
+                        />
+                    </div>
+                    <div class="tool">元</div>
+                </section>
+            </block>
+        </div>
+        <div class="btns">
+            <div class="btn" @click="saveOk">保存</div>
+        </div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+import uSteps from "../../components/uni-steps/uni-steps";
+
+export default {
+    name: "",
+    components: { MyImage, uSteps },
+    // 数据
+    data() {
+        return {
+            form: {
+                enablePoints: true,
+                pointsMaxProportion: "",
+                groupSignInRewardPoints: "",
+                inviteFriendRewardPoints: "",
+                enabledOrderPayRewardPoints: false,
+            },
+            submitLoading: false,
+        };
+    },
+
+    onLoad(opts) {
+        this.getData();
+    },
+
+    onShow() {},
+
+    // 函数
+    methods: {
+        getData() {
+            this.api.get("/Shop/GetPoints", {}, { pass: true }).then((res) => {
+                if (res.success && res.data) {
+                    this.form = { ...res.data };
+                    this.form.enablePoints = res.data.enbaled;
+                    this.form.pointsMaxProportion =
+                        res.data.maxDeductionProportion;
+                }
+            });
+        },
+        switchChange(e, name) {
+            let v = e.detail.value;
+            this.form[name] = v ? true : false;
+            this.form = { ...this.form };
+        },
+        saveOk() {
+            if (this.submitLoading) {
+                return;
+            }
+            if (
+                (this.form.pointsMaxProportion &&
+                    this.form.pointsMaxProportion > 100) ||
+                this.form.pointsMaxProportion < 0
+            ) {
+                this.fn.showToast("每单最高抵扣比例范围为0~100");
+                return;
+            }
+            console.log(this.form);
+            this.submitLoading = true;
+            uni.showLoading({
+                title: "提交中...",
+            });
+            let data = { ...this.form };
+            this.api
+                .post("/Shop/SetPoints", data, { pass: true })
+                .then((res) => {
+                    this.submitLoading = false;
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast("设置成功");
+                        this.router.back();
+                    } else {
+                        this.fn.showModal({
+                            title: "设置错误",
+                            content: res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
+        },
+    },
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+
+<style lang="scss" scoped>
+.page {
+    padding-bottom: px(120);
+    min-height: 100vh;
+    background-color: #fff;
+}
+.page--iphoneX {
+    padding-bottom: px(150);
+    .btn {
+        padding-bottom: px(30);
+        background-color: rgb(0, 188, 38);
+    }
+}
+.form-card {
+    background-color: #fff;
+    padding: 0 px(30);
+    & ~ .form-card {
+        margin-top: px(25);
+    }
+    .head {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: px(140);
+        background-color: #fbfbfb;
+        border-bottom: 1px solid #f1f1f1;
+        border-top: 1px solid #f1f1f1;
+        font-size: px(44);
+    }
+}
+.form-item {
+    display: flex;
+    min-height: px(140);
+    padding: px(30) 0;
+    box-sizing: border-box;
+    align-items: center;
+    font-size: px(44);
+    border-top: 1px solid #f1f1f1;
+    &.dis-item {
+        color: #999;
+        background: #f9f9f9;
+    }
+    .label {
+        // width: px(400);
+        flex-shrink: 0;
+        color: #666;
+        margin-right: px(20);
+    }
+    .box {
+        width: 100%;
+        position: relative;
+        input {
+            width: 100%;
+        }
+    }
+    .tool {
+        flex-shrink: 0;
+        color: #999;
+        margin-left: px(10);
+    }
+    textarea,
+    input {
+        max-width: 100%;
+        width: 100%;
+    }
+}
+.list {
+    // min-height: 100vh;
+    // background-color: #fff;
+    // border-bottom: 1px solid #f1f1f1;
+    li {
+        padding: px(0) px(35);
+        height: px(140);
+        line-height: px(140);
+        font-size: px(44);
+        border-top: 1px solid #f1f1f1;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .tools {
+        display: flex;
+        align-items: center;
+        flex-shrink: 0;
+        span {
+            display: inline-block;
+            border: 1px solid #f1f1f1;
+            font-size: px(36);
+            height: px(80);
+            width: px(120);
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            & ~ span {
+                margin-left: px(30);
+            }
+        }
+        .remove {
+            color: #f00;
+        }
+    }
+}
+.btn {
+    width: 100%;
+    height: px(120);
+    background-color: rgb(0, 188, 38);
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.btns {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 100;
+}
+.layout {
+    background-color: #eee;
+    color: #666;
+}
+.add-btn {
+    height: px(120);
+    color: #333;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: px(50) px(35) 0;
+    border: 1px solid #ccc;
+    border-radius: px(10);
+}
+.code-tool {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .scan-img {
+        flex-shrink: 0;
+        width: px(80);
+        height: px(80);
+        /deep/ img {
+            width: px(80);
+            height: px(80);
+        }
+    }
+    .generate {
+        color: #0097d1;
+        margin-right: px(30);
+        flex-shrink: 0;
+    }
+}
+.required {
+    color: #f00;
+    font-size: px(44);
+    &.hide {
+        visibility: hidden;
+    }
+}
+.inp-dis {
+    color: #999;
+}
+
+.img-card {
+    padding-top: px(30);
+    padding-bottom: px(30);
+}
+.form-img-item {
+    .tit {
+        padding: px(30);
+        font-size: px(44);
+    }
+}
+
+.spec-list {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    li {
+        width: 33.333333%;
+        font-size: px(40);
+        height: px(100);
+        border: 1px solid #f1f1f1;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #999;
+        & ~ li {
+            // border-left: none;
+        }
+        &.on {
+            color: rgb(0, 188, 38);
+            border-color: rgb(0, 188, 38);
+        }
+    }
+}
+.mo-date {
+    margin-top: px(20);
+    border-bottom: 1px solid #f1f1f1;
+    background: #fbfbfb;
+    font-size: px(40);
+    padding: px(10);
+}
+.n-date-box {
+    margin-top: px(20);
+    font-size: px(40);
+}
+.n-date {
+    border-bottom: 1px solid #f1f1f1;
+    background: #fbfbfb;
+    padding: 0 px(20);
+    display: inline-block;
+    width: px(200);
+    font-size: px(44);
+    vertical-align: bottom;
+}
+.address-icon {
+    /deep/ img {
+        width: px(60);
+        height: px(60);
+    }
+}
+.dis {
+    background-color: #f6f6f6;
+}
+.tip {
+    color: #999;
+    margin-left: px(10);
+}
+.step {
+    padding-top: px(50);
+    padding-bottom: px(50);
+}
+</style>

src/pages/manage/index.vue

@@ -38,24 +38,10 @@
                         <my-image class="img" :src="item.icon"></my-image>
                         <span class="text">{{ item.name }}</span>
                     </li>
-                    <li class="item" @click="jump('/pages/manage/user/index')">
-                        <my-image
-                            class="img"
-                            src="/static/icon/user.png"
-                        ></my-image>
-                        <span class="text">账号设置</span>
-                    </li>
                     <block v-if="storeStatus === 0 || storeStatus === 1">
-                        <li class="item" @click="jump('/pages/manage/points')">
-                            <my-image
-                                class="img"
-                                src="/static/icon/points.png"
-                            ></my-image>
-                            <span class="text">积分设置</span>
-                        </li>
                         <li
                             class="item"
-                            @click="jump('/pages/manage/set-shop')"
+                            @click="jump('/pages/manage/shop/index')"
                         >
                             <my-image
                                 class="img"
@@ -64,25 +50,18 @@
                             <span class="text">店铺设置</span>
                         </li>
                     </block>
-                </ul>
-            </block>
-            <ul class="menu" v-if="!showMenu">
-                <li class="item" @click="jump('/pages/manage/user/index')">
-                    <my-image
-                        class="img"
-                        src="/static/icon/user.png"
-                    ></my-image>
-                    <span class="text">账号设置</span>
-                </li>
-                <block v-if="storeStatus === 0 || storeStatus === 1">
-                    <li class="item" @click="jump('/pages/manage/points')">
+                    <li class="item" @click="jump('/pages/manage/user/index')">
                         <my-image
                             class="img"
-                            src="/static/icon/points.png"
+                            src="/static/icon/user.png"
                         ></my-image>
-                        <span class="text">积分设置</span>
+                        <span class="text">账号设置</span>
                     </li>
-                    <li class="item" @click="jump('/pages/manage/set-shop')">
+                </ul>
+            </block>
+            <ul class="menu" v-if="!showMenu">
+                <block v-if="storeStatus === 0 || storeStatus === 1">
+                    <li class="item" @click="jump('/pages/manage/shop/index')">
                         <my-image
                             class="img"
                             src="/static/icon/shop.png"
@@ -90,6 +69,13 @@
                         <span class="text">店铺设置</span>
                     </li>
                 </block>
+                <li class="item" @click="jump('/pages/manage/user/index')">
+                    <my-image
+                        class="img"
+                        src="/static/icon/user.png"
+                    ></my-image>
+                    <span class="text">账号设置</span>
+                </li>
             </ul>
         </div>
 

src/pages/manage/shop/delivery.vue

@@ -0,0 +1,447 @@
+<template>
+    <div class="page" :class="{ 'page--iphoneX': iphoneX }">
+        <div class="form-card">
+            <section class="form-item">
+                <div class="label">到店自提设置：</div>
+                <div class="box"></div>
+            </section>
+            <section class="form-item">
+                <div class="label">到店自提：</div>
+                <div class="box">
+                    <switch
+                        :value="true"
+                        :checked="form.deliveryMethod.storePickUp"
+                        @change="switchChange($event, 'storePickUp')"
+                    ></switch>
+                </div>
+            </section>
+            <section class="form-item" v-if="form.deliveryMethod.storePickUp">
+                <div class="label">最低自提下单金额：</div>
+                <div class="box">
+                    <input type="number" v-model="form.pickupMinAmount" />
+                </div>
+                <div class="tool">元</div>
+            </section>
+
+            <section class="form-item">
+                <div class="label">送货上门设置：</div>
+                <div class="box"></div>
+            </section>
+            <section class="form-item">
+                <div class="label">送货上门：</div>
+                <div class="box">
+                    <switch
+                        :value="true"
+                        :checked="form.deliveryMethod.homeDelivery"
+                        @change="switchChange($event, 'homeDelivery')"
+                    ></switch>
+                </div>
+            </section>
+            <block v-if="form.deliveryMethod.homeDelivery">
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        最低起送金额：
+                    </div>
+                    <div class="box">
+                        <input
+                            type="number"
+                            v-model="form.deliveryMinAmount"
+                        />
+                    </div>
+                    <div class="tool">元</div>
+                </section>
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        最远配送距离：
+                    </div>
+                    <div class="box">
+                        <input
+                            type="number"
+                            v-model="form.deliveryDistance"
+                        />
+                    </div>
+                    <div class="tool">公里</div>
+                </section>
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        配送费：
+                    </div>
+                    <div class="box">
+                        <input
+                            type="digit"
+                            v-model="form.deliveryFee"
+                        />
+                    </div>
+                    <div class="tool">元</div>
+                </section>
+                <section class="form-item">
+                    <div class="label">
+                        <!-- <span class="required">*</span> -->
+                        打包费：
+                    </div>
+                    <div class="box">
+                        <input
+                            type="digit"
+                            v-model="form.packageFee"
+                        />
+                    </div>
+                    <div class="tool">元</div>
+                </section>
+            </block>
+        </div>
+        <div class="btns">
+            <div class="btn" @click="saveOk">保存</div>
+        </div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../../components/image/index";
+
+export default {
+    name: "",
+    components: { MyImage },
+    // 数据
+    data() {
+        return {
+            form: {
+                deliveryMethod:{
+                    storePickUp:false, // 自提
+                    homeDelivery:false  // 上门
+                },
+                pickupMinAmount:0,  // 最低自提金额
+
+                deliveryMinAmount: 0, // 最低起送金额，
+                deliveryDistance: 0,   // 最远配送距离
+                deliveryFee: 0, // 配送费
+                packageFee: 0,  // 打包费
+            },
+            submitLoading: false,
+        };
+    },
+
+    onLoad(opts) {
+        this.getData();
+    },
+
+    onShow() {},
+
+    // 函数
+    methods: {
+        getData() {
+            this.api.get("/Shop/GetDeliveryConfig", {}, { pass: true }).then((res) => {
+                if (res.success && res.data) {
+                    this.form.deliveryMethod = res.data.deliveryMethod;
+                    this.form.pickupMinAmount = res.data.pickupMinAmount/100;
+                    this.form.deliveryMinAmount = res.data.deliveryMinAmount/100;
+                    this.form.deliveryDistance = res.data.deliveryDistance/1000;
+                    this.form.deliveryFee = res.data.deliveryFee/100;
+                    this.form.packageFee = res.data.packageFee/100;
+
+                    this.form = { ...this.form };
+                }
+            });
+        },
+        switchChange(e, name) {
+            let v = e.detail.value;
+            this.form.deliveryMethod[name] = v ? true : false;
+            this.form = { ...this.form };
+        },
+        saveOk() {
+            if (this.submitLoading) {
+                return;
+            }
+            if (!this.form.deliveryMethod.storePickUp && !this.form.deliveryMethod.homeDelivery){
+                return this.fn.showToast("至少选择一种方式");
+            }
+            
+            this.submitLoading = true;
+            uni.showLoading({
+                title: "提交中...",
+            });
+            let data = { ...this.form };
+            if(data.pickupMinAmount){
+                data.pickupMinAmount*=100;
+                data.pickupMinAmount = parseInt(data.pickupMinAmount);
+            }
+            if(data.deliveryMinAmount){
+                data.deliveryMinAmount*=100;
+                data.deliveryMinAmount = parseInt(data.deliveryMinAmount);
+            }
+            if(data.deliveryDistance){
+                data.deliveryDistance*=1000;
+                data.deliveryDistance = parseInt(data.deliveryDistance);
+            }
+            if(data.deliveryFee){
+                data.deliveryFee*=100;
+                data.deliveryFee = parseInt(data.deliveryFee);
+            }
+            if(data.packageFee){
+                data.packageFee*=100;
+                data.packageFee = parseInt(data.packageFee);
+            }
+            this.api
+                .post("/Shop/SetDeliveryConfig", data, { pass: true })
+                .then((res) => {
+                    this.submitLoading = false;
+                    uni.hideLoading();
+                    if (res.success) {
+                        this.fn.showToast("设置成功");
+                        this.router.back();
+                    } else {
+                        this.fn.showModal({
+                            title: "设置错误",
+                            content: res.message,
+                            showCancel: false,
+                        });
+                    }
+                });
+        },
+    },
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+
+<style lang="scss" scoped>
+.page {
+    padding-bottom: px(120);
+    min-height: 100vh;
+    background-color: #fff;
+}
+.page--iphoneX {
+    padding-bottom: px(150);
+    .btn {
+        padding-bottom: px(30);
+        background-color: rgb(0, 188, 38);
+    }
+}
+.form-card {
+    background-color: #fff;
+    padding: 0 px(30);
+    & ~ .form-card {
+        margin-top: px(25);
+    }
+    .head {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        height: px(140);
+        background-color: #fbfbfb;
+        border-bottom: 1px solid #f1f1f1;
+        border-top: 1px solid #f1f1f1;
+        font-size: px(44);
+    }
+}
+.form-item {
+    display: flex;
+    min-height: px(140);
+    padding: px(30) 0;
+    box-sizing: border-box;
+    align-items: center;
+    font-size: px(44);
+    border-top: 1px solid #f1f1f1;
+    &.dis-item {
+        color: #999;
+        background: #f9f9f9;
+    }
+    .label {
+        // width: px(400);
+        flex-shrink: 0;
+        color: #666;
+        margin-right: px(20);
+    }
+    .box {
+        width: 100%;
+        position: relative;
+        input {
+            width: 100%;
+        }
+    }
+    .tool {
+        flex-shrink: 0;
+        color: #999;
+        margin-left: px(10);
+    }
+    textarea,
+    input {
+        max-width: 100%;
+        width: 100%;
+    }
+}
+.list {
+    // min-height: 100vh;
+    // background-color: #fff;
+    // border-bottom: 1px solid #f1f1f1;
+    li {
+        padding: px(0) px(35);
+        height: px(140);
+        line-height: px(140);
+        font-size: px(44);
+        border-top: 1px solid #f1f1f1;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+    }
+    .tools {
+        display: flex;
+        align-items: center;
+        flex-shrink: 0;
+        span {
+            display: inline-block;
+            border: 1px solid #f1f1f1;
+            font-size: px(36);
+            height: px(80);
+            width: px(120);
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            & ~ span {
+                margin-left: px(30);
+            }
+        }
+        .remove {
+            color: #f00;
+        }
+    }
+}
+.btn {
+    width: 100%;
+    height: px(120);
+    background-color: rgb(0, 188, 38);
+    color: #fff;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+.btns {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 100;
+}
+.layout {
+    background-color: #eee;
+    color: #666;
+}
+.add-btn {
+    height: px(120);
+    color: #333;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: px(50) px(35) 0;
+    border: 1px solid #ccc;
+    border-radius: px(10);
+}
+.code-tool {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    .scan-img {
+        flex-shrink: 0;
+        width: px(80);
+        height: px(80);
+        /deep/ img {
+            width: px(80);
+            height: px(80);
+        }
+    }
+    .generate {
+        color: #0097d1;
+        margin-right: px(30);
+        flex-shrink: 0;
+    }
+}
+.required {
+    color: #f00;
+    font-size: px(44);
+    &.hide {
+        visibility: hidden;
+    }
+}
+.inp-dis {
+    color: #999;
+}
+
+.img-card {
+    padding-top: px(30);
+    padding-bottom: px(30);
+}
+.form-img-item {
+    .tit {
+        padding: px(30);
+        font-size: px(44);
+    }
+}
+
+.spec-list {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    li {
+        width: 33.333333%;
+        font-size: px(40);
+        height: px(100);
+        border: 1px solid #f1f1f1;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        color: #999;
+        & ~ li {
+            // border-left: none;
+        }
+        &.on {
+            color: rgb(0, 188, 38);
+            border-color: rgb(0, 188, 38);
+        }
+    }
+}
+.mo-date {
+    margin-top: px(20);
+    border-bottom: 1px solid #f1f1f1;
+    background: #fbfbfb;
+    font-size: px(40);
+    padding: px(10);
+}
+.n-date-box {
+    margin-top: px(20);
+    font-size: px(40);
+}
+.n-date {
+    border-bottom: 1px solid #f1f1f1;
+    background: #fbfbfb;
+    padding: 0 px(20);
+    display: inline-block;
+    width: px(200);
+    font-size: px(44);
+    vertical-align: bottom;
+}
+.address-icon {
+    /deep/ img {
+        width: px(60);
+        height: px(60);
+    }
+}
+.dis {
+    background-color: #f6f6f6;
+}
+.tip {
+    color: #999;
+    margin-left: px(10);
+}
+</style>

src/pages/manage/shop/index.vue

@@ -0,0 +1,86 @@
+<template>
+    <div class="page">
+        <ul class="list">
+            <li class="item" @click="jump('/pages/manage/shop/set-shop')">
+                <div class="name">基础设置</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
+            <li class="item" @click="jump('/pages/manage/shop/delivery')">
+                <div class="name">配送设置</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
+            <li class="item" @click="jump('/pages/manage/shop/points')">
+                <div class="name">积分设置</div>
+                <my-image
+                    class="arrow"
+                    src="/static/common/arrows_left.png"
+                ></my-image>
+            </li>
+        </ul>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../../components/image/index";
+export default {
+    name: "",
+    components: { MyImage },
+
+    // 数据
+    data() {
+        return {
+            curShop: {},
+        };
+    },
+
+    onLoad() {},
+    async onShow() {},
+    // 函数
+    methods: {},
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.page {
+    min-height: 100vh;
+    background-color: #fff;
+}
+.list {
+    border-top: 1px solid #f1f1f1;
+    .item {
+        height: px(120);
+        padding: 0 px(35);
+        font-size: px(44);
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        border-bottom: 1px solid #f1f1f1;
+    }
+    .arrow {
+        width: px(40);
+        height: px(40);
+        flex-shrink: 0;
+        transform: rotate(180deg);
+        /deep/ img {
+            width: px(40);
+            height: px(40);
+        }
+    }
+}
+</style>

src/pages/manage/points.vue

@@ -64,6 +64,7 @@
                                 )
                             "
                         ></switch>
+                        <span class="tip">购买每支付1元赠1积分</span>
                     </div>
                 </section>
             </block>
@@ -75,7 +76,7 @@
 </template>
 
 <script>
-import MyImage from "../../components/image/index";
+import MyImage from "../../../components/image/index";
 
 export default {
     name: "",

src/pages/manage/set-shop.vue

@@ -15,9 +15,9 @@
                     />
                 </div>
             </section>
-            <section class="form-item dis">
+            <section class="form-item">
                 <div class="label">
-                    <!-- <span class="required">*</span> -->
+                    <span class="required">*</span>
                     店长电话：
                 </div>
                 <div class="box">
@@ -111,9 +111,9 @@
 </template>
 
 <script>
-import MyImage from "../../components/image/index";
-import DateTimePicker from "../../components/biaofun-datetime-picker/biaofun-datetime-picker";
-import easyUpload from "../../components/easy-upload/easy-upload";
+import MyImage from "../../../components/image/index";
+import DateTimePicker from "../../../components/biaofun-datetime-picker/biaofun-datetime-picker";
+import easyUpload from "../../../components/easy-upload/easy-upload";
 
 export default {
     name: "",

src/pages/wallet/index.vue

@@ -0,0 +1,144 @@
+<template>
+    <div class="page">
+        <div class="info card">
+            <h1 class="tit">账号信息</h1>
+            <ul class="info-list">
+                <li class="item">
+                    <div class="key">姓名:</div>
+                    <div class="value">cr</div>
+                </li>
+                <li class="item">
+                    <div class="key">微信号:</div>
+                    <div class="value">wx1503213</div>
+                </li>
+                <li class="item">
+                    <div class="key">银行:</div>
+                    <div class="value">招商银行</div>
+                </li>
+                <li class="item">
+                    <div class="key">开户行:</div>
+                    <div class="value">北京市xxx</div>
+                </li>
+                <li class="item">
+                    <div class="key">卡号:</div>
+                    <div class="value">6225845254521545215</div>
+                </li>
+            </ul>
+        </div>
+        <div class="money card">
+            <h1 class="tit">可提现金额</h1>
+            <div class="money-num">
+                <div class="num">￥960.00</div>
+                <div class="view">查看账单</div>
+            </div>
+            <p class="tip">最低提现2元，单日上线20000元</p>
+            <div class="input">
+                <input type="digit">
+            </div>
+            <p class="tip tip-color">最低提现2元，单日上线20000元</p>
+            <button type="button" class="btn">申请提现</button>
+        </div>
+        <div class="card record">
+            <h1 class="tit">提现记录  共2条</h1>
+            <ul class="table">
+                <li class="row">
+                    <div class="item">
+                        申请时间
+                    </div>
+                    <div class="item">
+                        提现方式
+                    </div>
+                    <div class="item">
+                        金额
+                    </div>
+                    <div class="item">
+                        状态
+                    </div>
+                </li>
+                <li class="row">
+                    <div class="item">
+                        2021/01/01
+                    </div>
+                    <div class="item">
+                        微信
+                    </div>
+                    <div class="item">
+                        100
+                    </div>
+                    <div class="item">
+                        已提交
+                    </div>
+                </li>
+            </ul>
+        </div>
+    </div>
+</template>
+
+<script>
+import MyImage from "../../components/image/index";
+
+export default {
+    name: "",
+    components: { MyImage },
+    // 数据
+    data() {
+        return {
+        };
+    },
+    filters: {},
+    onLoad() {},
+    async onShow() {
+    },
+
+    // onPullDownRefresh() {
+    //     this.getList();
+    // },
+
+    // 函数
+    methods: {
+
+    },
+
+    // 数据计算
+    computed: {
+        user() {
+            return this.$store.state.user.user;
+        },
+    },
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+
+<style lang="scss" scoped>
+.card{
+    margin: px(40) px(40);
+    border: 1px solid #efefef;
+    padding: px(40);
+    background-color: #fff;
+    .tit{
+        font-size: px(44);
+        font-weight: bold;
+        padding-bottom: px(20);
+    }
+}
+.info{
+    .item{
+        margin-top: px(20);
+        font-size: px(40);
+        display: flex;
+        align-items: start;
+        line-height: px(60);
+        .key{
+            margin-right: px(20);
+            flex-shrink: 0;
+            color: #666;
+        }
+    }
+}
+.money{
+    
+}
+</style>