Merge branch 'master' into dev

a.txt

@@ -27,4 +27,7 @@ f68b8e48-c681-467b-af76-e1612c26d62e 主播 主播人员
 商家端登录密码：60EBMGQCb3
 
 测试注册
-xkjsglsadmin/xkjsgls2020
+xkjsglsadmin/xkjsgls2020
+
+小客家水果
+xkjsgadmin／xkjsg2020

releaselog.md

@@ -1,4 +1,15 @@
 
+# 0.4.5 (21.02.03 18:00) 
+### 修改bug
+
+# 0.4.4 (21.02.02 18:00) 
+### 商品编辑页新功能，起购数
+
+
+# 0.4.3 (21.01.27 18:00) 
+### 管理员才可以修改门店
+
+
 # 0.4.2 (21.01.13 18:00) 
 ### 增加收银挂单
 

src/App.vue

@@ -33,6 +33,22 @@ export default {
                 }
             },
         });
+
+        // 测试
+        //   uni.getLocation({
+        //         type: "gcj02",
+        //         success: function (res) {
+        //             // let query = {
+        //             //     location: res.longitude + "," + res.latitude,
+        //             //     wechatMinaAppId: appConfig.appId,
+        //             // };
+        //             // self.api.get("/Home/GetShopList", query).then((res) => {
+        //             //     uni.hideLoading();
+        //             //     self.shopList = self.initData(res.data);
+        //             // });
+        //             console.log(res);
+        //         },
+        //     });
     },
 
     onShow: async function (option) {

src/manifest.json

@@ -120,6 +120,11 @@
         "setting" : {
             "urlCheck" : false
         },
+        "permission":{
+            "scope.userLocation":{
+                "desc":"你的位置信息将用于门店定位"
+            }
+        },
         "usingComponents" : true
     },
     "mp-alipay" : {

src/pages/index/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page">
         <div class="page__top">
-            <div class="shop-main">
+            <div class="shop-main" v-if="isAdmin">
                 <div class="name">当前门店：</div>
                 <div class="shop" @click="goShopSelect">
                     <div class="shop__name">
@@ -11,6 +11,16 @@
                     </div>
                 </div>
             </div>
+            <div class="shop-main" v-else>
+                <div class="name">当前门店：</div>
+                <div class="shop">
+                    <div class="shop__name">
+                        <!-- 最多6字 -->
+                        {{ user.storeName }}
+                        <!-- <i class="iconfont iconyoujiantou shop__arrow"></i> -->
+                    </div>
+                </div>
+            </div>
             <div class="scan">
                 <my-image
                     class="scan-img"
@@ -977,23 +987,34 @@ export default {
             if (val.loading) {
                 return;
             }
-            val.loading = true;
-            this.api
-                .post(
-                    "/Order/RejectRefund",
-                    {
-                        query: true,
-                        id: val.id,
-                    },
-                    { pass: true }
-                )
+
+            this.fn
+                .showModal({
+                    content: "是否拒绝退款？",
+                })
                 .then((res) => {
-                    val.loading = false;
-                    if (res.success) {
-                        this.fn.showToast("操作成功");
-                        this.getList();
-                    } else {
-                        this.fn.showToast("操作失败：" + res.message);
+                    if (res.confirm) {
+                        val.loading = true;
+                        this.api
+                            .post(
+                                "/Order/RejectRefund",
+                                {
+                                    query: true,
+                                    id: val.id,
+                                },
+                                { pass: true }
+                            )
+                            .then((res) => {
+                                val.loading = false;
+                                if (res.success) {
+                                    this.fn.showToast("操作成功");
+                                    this.getList();
+                                } else {
+                                    this.fn.showToast(
+                                        "操作失败：" + res.message
+                                    );
+                                }
+                            });
                     }
                 });
         },
@@ -1003,23 +1024,34 @@ export default {
             if (val.loading) {
                 return;
             }
-            val.loading = true;
-            this.api
-                .post(
-                    "/Order/AgreeRefund",
-                    {
-                        query: true,
-                        id: val.id,
-                    },
-                    { pass: true }
-                )
+
+            this.fn
+                .showModal({
+                    content: "是否同意退款？",
+                })
                 .then((res) => {
-                    val.loading = false;
-                    if (res.success) {
-                        this.fn.showToast("操作成功");
-                        this.getList();
-                    } else {
-                        this.fn.showToast("操作失败：" + res.message);
+                    if (res.confirm) {
+                        val.loading = true;
+                        this.api
+                            .post(
+                                "/Order/AgreeRefund",
+                                {
+                                    query: true,
+                                    id: val.id,
+                                },
+                                { pass: true }
+                            )
+                            .then((res) => {
+                                val.loading = false;
+                                if (res.success) {
+                                    this.fn.showToast("操作成功");
+                                    this.getList();
+                                } else {
+                                    this.fn.showToast(
+                                        "操作失败：" + res.message
+                                    );
+                                }
+                            });
                     }
                 });
         },
@@ -1115,7 +1147,25 @@ export default {
         },
 
         curShopId() {
-            return this.$store.state.common.curShop.id;
+            if (this.isAdmin) {
+                return this.$store.state.common.curShop.id;
+            } else {
+                return this.user && this.user.storeId;
+            }
+        },
+        isAdmin() {
+            //店铺管理员  系统管理员
+            console.log(this.user, 111);
+            if (this.user) {
+                if (
+                    this.user.roleId ===
+                        "50c41c5d-b54c-43ed-b587-10dcb60e72e5" ||
+                    this.user.roleId === "75b71b24-25de-40ac-a866-c8f5555b8b92"
+                ) {
+                    return true;
+                }
+            }
+            return false;
         },
     },
 

src/pages/index/login.vue

@@ -90,6 +90,9 @@ export default {
                                 } else {
                                     // 正常用户
                                     this.$store.commit("user/login", res.data);
+                                    this.$store.commit("common/update", {
+                                        curShop: {},
+                                    });
                                     this.router.replace({
                                         isReLaunch: true,
                                         path: "/pages/index/index",

src/pages/manage/add-good-form.vue

@@ -393,6 +393,19 @@
                     ></easy-upload>
                 </div>
             </section>
+            <section class="form-item" style="border-top: 1px solid #f1f1f1;margin-top:10px;">
+                <div class="label">
+                    <span class="required hide">*</span>
+                    商品描述：
+                </div>
+                <div class="box">
+                    <textarea
+                        v-model="baseInfo.summary"
+                        :maxlength="1048"
+                        :auto-height="true"
+                    ></textarea>
+                </div>
+            </section>
         </div>
         <!-- 其他 -->
         <div class="form-card">
@@ -441,19 +454,6 @@
                         </radio-group>
                     </div>
                 </section>
-                <section class="form-item">
-                    <div class="label">
-                        <span class="required hide">*</span>
-                        商品描述：
-                    </div>
-                    <div class="box">
-                        <textarea
-                            v-model="baseInfo.description"
-                            :maxlength="1048"
-                            :auto-height="true"
-                        ></textarea>
-                    </div>
-                </section>
                 <section class="form-item">
                     <div class="label">
                         <span class="required">*</span>
@@ -487,6 +487,15 @@
                         />
                     </div>
                 </section>
+                <section class="form-item">
+                    <div class="label">
+                        <span class="required hide">*</span>
+                        起购数：
+                    </div>
+                    <div class="box">
+                        <input type="number" v-model="baseInfo.minBuyCount" />
+                    </div>
+                </section>
                 <!-- <section class="form-item">
                     <div class="label">
                         <span class="required">*</span>
@@ -563,7 +572,7 @@ export default {
                 barCode: "", // 条码
                 name: "", // 标题
                 code: "", // 编码
-                description: "", // 描述
+                summary: "", // 描述
                 productTypeIds: [], // 分类
 
                 price: 0, // 价格
@@ -578,6 +587,7 @@ export default {
                 status: 1, // 出售方式 0-放入仓库（即没有上架），1-立即出售（即上架）
                 _statusName: "立即出售",
                 maxBuyableCount: 0, // 限购数
+                minBuyCount: 0,
 
                 mainImage: "", // 封面图 300 *300
             },
@@ -1161,7 +1171,7 @@ export default {
                 barCode: "", // 条码
                 name: "", // 标题
                 code: "", // 编码
-                description: "", // 描述
+                summary: "", // 描述
                 productTypeIds: [], // 分类
 
                 price: 0, // 价格
@@ -1176,6 +1186,7 @@ export default {
                 status: 1, // 出售方式 0-放入仓库（即没有上架），1-立即出售（即上架）
                 _statusName: "立即出售",
                 maxBuyableCount: 0, // 限购数
+                minBuyCount: 0,
 
                 mainImage: "", // 主图 300 *300
             };
@@ -1633,5 +1644,4 @@ button::before {
     display: inline-block;
     margin-left: px(10);
 }
-
 </style>

src/pages/manage/edit-good-form.vue

@@ -390,6 +390,22 @@
                     ></easy-upload>
                 </div>
             </section>
+            <section
+                class="form-item"
+                style="border-top: 1px solid #f1f1f1; margin-top: 10px"
+            >
+                <div class="label">
+                    <span class="required hide">*</span>
+                    商品描述：
+                </div>
+                <div class="box">
+                    <textarea
+                        v-model="baseInfo.summary"
+                        :maxlength="1048"
+                        :auto-height="true"
+                    ></textarea>
+                </div>
+            </section>
         </div>
         <!-- 其他 -->
         <div class="form-card">
@@ -438,20 +454,6 @@
                         </radio-group>
                     </div>
                 </section>
-
-                <section class="form-item">
-                    <div class="label">
-                        <span class="required hide">*</span>
-                        商品描述：
-                    </div>
-                    <div class="box">
-                        <textarea
-                            v-model="baseInfo.description"
-                            :maxlength="1048"
-                            :auto-height="true"
-                        ></textarea>
-                    </div>
-                </section>
                 <section class="form-item">
                     <div class="label">
                         <span class="required">*</span>
@@ -485,6 +487,15 @@
                         />
                     </div>
                 </section>
+                <section class="form-item">
+                    <div class="label">
+                        <span class="required hide">*</span>
+                        起购数：
+                    </div>
+                    <div class="box">
+                        <input type="number" v-model="baseInfo.minBuyCount" />
+                    </div>
+                </section>
                 <!-- <section class="form-item">
                     <div class="label">
                         <span class="required">*</span>
@@ -507,6 +518,9 @@
             <button type="button" class="btn" @click="save('back')">
                 保存
             </button>
+            <button type="button" class="btn" @click="save('send')" :class="{dis:baseInfo.status ===0}">
+                保存并推送
+            </button>
         </div>
     </div>
 </template>
@@ -559,7 +573,7 @@ export default {
                 barCode: "", // 条码
                 name: "", // 标题
                 code: "", // 编码
-                description: "", // 描述
+                summary: "", // 描述
                 productTypeIds: [], // 分类
 
                 price: 0, // 价格
@@ -574,6 +588,7 @@ export default {
                 status: 1, // 出售方式 0-放入仓库（即没有上架），1-立即出售（即上架）
                 _statusName: "立即出售",
                 maxBuyableCount: 0, // 限购数
+                minBuyCount: 0,
 
                 mainImage: "", // 主图 300 *300
             },
@@ -1250,18 +1265,18 @@ export default {
             this.submitLoading = true;
             uni.showLoading({
                 title: "提交中...",
-                mask:true
+                mask: true,
             });
             this.api
                 .post("/product/SaveEdit", sendData, { pass: true })
                 .then((res) => {
                     this.submitLoading = false;
-                uni.hideLoading();
+                    uni.hideLoading();
                     if (res.success) {
-                        if (type === "next") {
-                        } else {
-                            this.router.back();
+                        if (type === "send") {
+                            this.sendProduct('text');
                         }
+                        this.router.back();
                     } else {
                         this.fn.showModal({
                             content: res.message,
@@ -1426,6 +1441,30 @@ export default {
                 ...obj,
             };
         },
+
+        sendProduct(item, type) {
+            let sendData = {
+                pid: this.oldData.baseInfo.id,
+                storeId: this.oldData.baseInfo.storeId,
+            };
+            if (type === "text") {
+                sendData.sendTxt = false;
+                sendData.sendVideo = false;
+                sendData.sendImg = 0;
+            } else {
+                // sendData.sendTxt = true;
+                // sendData.sendVideo = true;
+                // sendData.sendImg = 3;
+            }
+
+            this.api
+                .get("https://bot.ixiaokejia.com/Home/sendproduct", sendData, {
+                    pass: true,
+                })
+                .then((res) => {
+                    this.fn.showToast(res.message);
+                });
+        },
     },
 
     // 数据计算
@@ -1562,6 +1601,11 @@ radio-group {
     & ~ .btn {
         border-left: 1px solid #999;
     }
+    &.dis{
+        background-color: #eee;
+        color: #666;
+        pointer-events: none;
+    }
 }
 button::after {
     border: none;

src/pages/manage/good-list.vue

@@ -240,17 +240,24 @@
                                         </div>
                                         <div
                                             class="btn"
-                                            @click="setPrice(item)"
+                                            @click="sendProduct(item, 'text')"
                                         >
-                                            改价
+                                            
+                                            推荐链接
                                         </div>
                                         <div
                                             class="btn"
-                                            @click="setStock(item)"
+                                            @click="sendProduct(item, 'product')"
                                         >
-                                            改库存
+                                            推荐商品
                                         </div>
                                         <div
+                                            class="btn"
+                                            @click="openMore(item)"
+                                        >
+                                            更多
+                                        </div>
+                                        <!-- <div
                                             class="btn"
                                             v-if="item.status === 0"
                                             @click="setStatus(item, 1)"
@@ -263,7 +270,7 @@
                                             @click="setStatus(item, 0)"
                                         >
                                             下架
-                                        </div>
+                                        </div> -->
                                     </div>
                                 </li>
                             </ul>
@@ -361,7 +368,8 @@
             </div>
         </div>
 
-        <my-share ref="share" @share="saveImage"></my-share>
+        <shop-select ref="shopSelect"></shop-select>
+        
     </div>
 </template>
 
@@ -372,9 +380,10 @@ import uniPopupDialog from "../../components/uni-popup/uni-popup-dialog";
 import uniPopupSpec from "../../components/uni-popup/uni-popup-spec";
 import config from "../../common/js/config";
 import MyShare from "../../components/share/index";
+import ShopSelect from "./shop-select";
 export default {
     name: "",
-    components: { MyImage, uniPopup, uniPopupDialog, MyShare, uniPopupSpec },
+    components: { MyImage, uniPopup, uniPopupDialog, MyShare, uniPopupSpec,ShopSelect },
     // 数据
     data() {
         return {
@@ -415,6 +424,12 @@ export default {
             shareGood: {},
             shareRootLoading: false,
             shareLoadList: [],
+
+            // other
+            otherUrl: "https://bot.ixiaokejia.com/",
+            shopList: null,
+
+            curGood: null,
         };
     },
 
@@ -1308,6 +1323,96 @@ export default {
                 this.share(val);
             }
         },
+
+        openMore(item) {
+            let arr = [];
+            if (item.status === 0) {
+                arr.push("上架");
+            } else {
+                arr.push("下架");
+            }
+            arr = [...arr, "改价", "改库存", "跨店复制"];
+            uni.showActionSheet({
+                itemList: arr,
+                success: (res) => {
+                    switch (res.tapIndex) {
+                        case 0:
+                            if (item.status === 0) {
+                                this.setStatus(item, 1);
+                            } else {
+                                this.setStatus(item, 0);
+                            }
+                            break;
+                        case 1:
+                            this.setPrice(item);
+                            // this.sendProduct(item, "text");
+                            break;
+                        case 2:
+                            this.setStock(item);
+                            // this.sendProduct(item, "product");
+                            break;
+                        case 3:
+                            this.copyProductsPlay(item);
+                            break;
+                    }
+                },
+            });
+        },
+
+        sendProduct(item, type) {
+            let sendData = {
+                pid: item.id,
+                storeId: item.storeId,
+            };
+            if (type === "text") {
+                sendData.sendTxt = false;
+                sendData.sendVideo = false;
+                sendData.sendImg = 0;
+            } else {
+                // sendData.sendTxt = true;
+                // sendData.sendVideo = true;
+                // sendData.sendImg = 3;
+            }
+
+            this.api
+                .get(this.otherUrl + "Home/sendproduct", sendData, {
+                    pass: true,
+                })
+                .then((res) => {
+                    this.fn.showToast(res.message);
+                });
+        },
+
+        copyProductsPlay(item) {
+            if(!this.isAdmin){
+                return this.fn.showToast('非管理员无权操作！');
+            }
+            if (!this.shopList) {
+                this.getShopList(item);
+            } else {
+                this.copyProducts(item);
+            }
+        },
+
+        getShopList(item) {
+            uni.showLoading({
+                title: "加载中...",
+            });
+            this.api.get("/Store/GetShopList").then((res) => {
+                uni.hideLoading();
+                for(let item of res.data){
+                    item.label = item.name;
+                    item.value = item.id;
+                }
+                this.shopList = res.data;
+                this.copyProducts(item);
+            });
+        },
+
+        copyProducts(good) {
+            this.curGood = good;
+            this.$refs.shopSelect.open(good,this.shopList)
+        },
     },
 
     // 数据计算
@@ -1319,6 +1424,17 @@ export default {
         user() {
             return this.$store.state.user.user;
         },
+        isAdmin() {
+            //店铺管理员  系统管理员
+            if (
+                this.user.roleId === "50c41c5d-b54c-43ed-b587-10dcb60e72e5" ||
+                this.user.roleId === "75b71b24-25de-40ac-a866-c8f5555b8b92"
+            ) {
+                return true;
+            } else {
+                return false;
+            }
+        },
     },
 
     // 数据监听
@@ -1955,4 +2071,5 @@ page {
     flex-shrink: 0;
     margin-right: px(30);
 }
+
 </style>

src/pages/manage/index.vue

@@ -42,7 +42,7 @@
                     ></my-image>
                     <span class="text">账号设置</span>
                 </li> -->
-                <li class="item" @click="jump('/pages/manage/cashier/index')">
+                <!-- <li class="item" @click="jump('/pages/manage/cashier/index')">
                     <my-image
                         class="img"
                         src="/static/icon/cashier.png"
@@ -62,12 +62,13 @@
                         src="/static/icon/user.png"
                     ></my-image>
                     <span class="text">app接口测试</span>
-                </li>
+                </li> -->
             </ul>
             <div class="ver">0.4.2</div>
         </div>
 
         <button class="btn" @click="layout">退出登录</button>
+        <div class="ver">0.4.5</div>
     </div>
 </template>
 

src/pages/manage/shop-select.vue

@@ -0,0 +1,216 @@
+<template>
+    <div class="g-spec-modal" v-if="show" :class="{ page_red: theme === 1 }">
+        <div class="bg" @click="close"></div>
+        <div class="main">
+            <div class="head">
+                <span class="tit">跨店复制商品</span>
+                <span class="close" @click="close">×</span>
+            </div>
+            <div class="box">
+                <div class="title">商品：{{ goods.name }}</div>
+                <div class="select">
+                    <picker
+                        :range="pricerData"
+                        @change="chenge"
+                        :mode="'selector'"
+                    >
+                        <input
+                            type="text"
+                            :disabled="true"
+                            :value="curShop.name"
+                            placeholder="请选择目标店铺"
+                        />
+                    </picker>
+                </div>
+            </div>
+
+            <div class="modal-bottom">
+                <div class="btn" @click="submit">确定</div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "ShopSelect",
+    components: {},
+    props: {},
+
+    // 数据
+    data() {
+        return {
+            show: false,
+            goods: {},
+            shopList: [],
+            pricerData: [],
+            curShop: {},
+            submitLoading:false,
+        };
+    },
+
+    // 函数
+    methods: {
+        // 打开
+        open(good, shopList) {
+            const self = this;
+            console.log("open");
+            self.show = true;
+            this.goods = good;
+            this.shopList = shopList;
+            let strArr = [];
+            for (let item of this.shopList) {
+                strArr.push(item.name);
+            }
+            this.pricerData = strArr;
+        },
+
+        // 关闭
+        close() {
+            const self = this;
+
+            self.show = false;
+        },
+
+        chenge(e) {
+            this.curShop = this.shopList[e.detail.value];
+            // console.log(e);
+        },
+
+        submit() {
+            if (!this.curShop.id) {
+                return this.fn.fn.showToast("请先选择店铺");
+            }
+            if (this.submitLoading) {
+                return;
+            }
+            this.submitLoading = true;
+            uni.showLoading({
+                title: "提交中...",
+            });
+            this.api
+                .post("/Product/CopyProducts", {
+                    storeId: this.curShop.id,
+                    productIds: [this.goods.id],
+                })
+                .then((res) => {
+                    uni.hideLoading();
+                    this.submitLoading = false;
+                    if (res.success) {
+                        this.fn.showToast("操作成功");
+                        this.close();
+                    } else {
+                        this.fn.showToast("操作失败 " + res.message);
+                    }
+                });
+        },
+    },
+
+    // 数据计算
+    computed: {},
+
+    // 数据监听
+    watch: {},
+};
+</script>
+
+<style lang="scss" scoped>
+.g-spec-modal {
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 3000;
+    .bg {
+        width: 100%;
+        height: 100%;
+        background-color: rgba(0, 0, 0, 0.3);
+    }
+    .main {
+        background-color: #fff;
+        border-radius: px(30);
+        position: absolute;
+        top: 50%;
+        left: px(100);
+        right: px(100);
+        transform: translate(0, -50%);
+        max-height: 90vh;
+        overflow: auto;
+        z-index: 100;
+        padding: px(40) 0;
+    }
+    .head {
+        font-size: px(44);
+        position: relative;
+        padding-bottom: px(30);
+        border-bottom: 1px solid #f1f1f1;
+        line-height: px(88);
+        padding: 0 px(40);
+        .close {
+            font-size: px(80);
+            color: #666;
+            position: absolute;
+            right: px(40);
+            top: 0%;
+            z-index: 10;
+        }
+        .tit {
+            margin-right: px(80);
+            display: block;
+            @include omit(100%);
+            width: auto;
+        }
+    }
+}
+
+.box {
+    font-size: px(40);
+    padding: px(40);
+    .title {
+        padding-bottom: px(20);
+    }
+    .select {
+        border: 1px solid #f1f1f1;
+        height: px(100);
+        line-height: px(100);
+        padding: 0 px(20);
+        margin-top: px(20);
+    }
+}
+
+.modal-bottom {
+    display: flex;
+    margin-top: px(50);
+    justify-content: flex-end;
+    align-items: center;
+    padding: 0 px(40);
+    .price {
+        color: #fe6661;
+        font-size: px(40);
+        .num {
+            font-size: px(50);
+        }
+    }
+    .btn {
+        display: block;
+        background-color: #27a34f;
+        color: #fff;
+        width: px(280);
+        height: px(80);
+        font-size: px(34);
+        text-align: center;
+        line-height: px(80);
+        border-radius: px(40);
+    }
+}
+
+.page_red {
+    .modal-bottom .btn {
+        background-color: #fe6661;
+    }
+    .btns__add {
+        background-color: #fe6661;
+    }
+}
+</style>