收银完成

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

@@ -100,7 +100,9 @@
                                 placeholder="请选择"
                             />
                         </picker>
-                        <span class="remove-text" @click="typeRemove(index,item)"
+                        <span
+                            class="remove-text"
+                            @click="typeRemove(index, item)"
                             >删除</span
                         >
                     </div>
@@ -376,7 +378,10 @@
             </section>
             <section class="form-img-item">
                 <div class="tit">
-                    <span class="required hide">*</span>视频<span class="gray-text">(视频文件最大不超过100M)</span>
+                    <span class="required hide">*</span>视频<span
+                        class="gray-text"
+                        >(视频文件最大不超过100M)</span
+                    >
                 </div>
                 <div class="list">
                     <easy-upload
@@ -515,7 +520,7 @@
 
 <script>
 import MyImage from "../../components/image/index";
-import EasyUpload from '../../components/easy-upload/easy-upload';
+import EasyUpload from "../../components/easy-upload/easy-upload";
 
 export default {
     name: "",
@@ -581,12 +586,12 @@ export default {
 
                 images: [], // 主图
                 detailImages: [], // 详情图
-                video:'',
-                videoConver:'',
+                video: "",
+                videoConver: "",
             },
             mainImage: [],
-            videoConver:[],
-            video:[],
+            videoConver: [],
+            video: [],
 
             // 规格
             specIndex: 0,
@@ -596,7 +601,7 @@ export default {
             curSpecIndex: 0, // 当前编辑specData
             skuTableData: [], // sku表格数据  详情见initSkuTable
             skuAttrs: {}, // sku后台保存用
-            submitLoading:false,
+            submitLoading: false,
         };
     },
     onLoad() {
@@ -897,8 +902,8 @@ export default {
             this.typeList.splice(i, 1);
             this.typeList = [...this.typeList];
             let ids = [];
-            for(let item of this.baseInfo.productTypeIds){
-                if(item !== val.id){
+            for (let item of this.baseInfo.productTypeIds) {
+                if (item !== val.id) {
                     ids.push(item);
                 }
             }
@@ -950,7 +955,7 @@ export default {
 
         // 保存
         save(type) {
-            if(this.submitLoading){
+            if (this.submitLoading) {
                 return;
             }
             let requiredFile1 = [
@@ -1090,17 +1095,19 @@ export default {
                 hotSaleRecommendIds: [],
                 businessRecommendIds: [],
                 participated: false,
-                participatedBox:false,
+                participatedBox: false,
                 skuInfo: skuInfo,
             };
-            if(sendData.baseInfo.weight){
+            if (sendData.baseInfo.weight) {
                 sendData.baseInfo.weight = Number(sendData.baseInfo.weight);
             }
-            if(sendData.baseInfo.stock){
+            if (sendData.baseInfo.stock) {
                 sendData.baseInfo.stock = Number(sendData.baseInfo.stock);
             }
-            if(sendData.baseInfo.initialSale){
-                sendData.baseInfo.initialSale = Number(sendData.baseInfo.initialSale);
+            if (sendData.baseInfo.initialSale) {
+                sendData.baseInfo.initialSale = Number(
+                    sendData.baseInfo.initialSale
+                );
             }
             //规格判断
             if (this.specIndex === 0) {
@@ -1118,29 +1125,31 @@ 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();
-                if (res.success) {
-                    if (type === "next") {
-                        this.fn.showToast("保存成功");
-                        this.reset();
+            this.api
+                .post("/product/SaveEdit", sendData, { pass: true })
+                .then((res) => {
+                    this.submitLoading = false;
+                    uni.hideLoading();
+                    if (res.success) {
+                        if (type === "next") {
+                            this.fn.showToast("保存成功");
+                            this.reset();
+                        } else {
+                            this.fn.showToast("保存成功");
+                            this.router.back();
+                        }
                     } else {
-                        this.fn.showToast("保存成功");
-                        this.router.back();
+                        this.fn.showModal({
+                            content: res.message,
+                            showCancel: false,
+                        });
                     }
-                } else {
-                    this.fn.showModal({
-                        content: res.message,
-                        showCancel: false,
-                    });
-                }
-            });
+                });
         },
 
         // 重置
@@ -1175,7 +1184,7 @@ export default {
 
                 images: [], // 封面图
                 detailImages: [], // 详情图
-                video:''
+                video: "",
             };
 
             this.video = [];
@@ -1619,9 +1628,10 @@ button::before {
 .sepc-card {
     padding-bottom: px(30);
 }
-.gray-text{
+.gray-text {
     color: #999;
     display: inline-block;
     margin-left: px(10);
 }
+
 </style>

src/pages/manage/cashier/index.vue

@@ -748,6 +748,8 @@ export default {
                                             item.select_num = res.select_num;
                                             arr.push(item);
                                         }
+                                    }else{
+                                        arr.push(item);
                                     }
                                 }
                                 this.selectList = arr;

src/pages/manage/cashier/settlement.vue

@@ -32,7 +32,7 @@
             <div class="info" v-if="surplusPrice > 0">
                 <div class="tools">
                     <span @click="discountShow">折扣</span>
-                    <span>优惠券</span>
+                    <!-- <span>优惠券</span> -->
                 </div>
                 <div class="money">
                     <span>应收（元）</span>
@@ -142,6 +142,16 @@
                             %
                         </section>
                     </div>
+                    <ul
+                        class="dis-list"
+                        v-if="discountList && discountList.length"
+                    >
+                        <li v-for="item of discountList" :key="item">
+                            <div class="box" @click="disItemClick(item)">
+                                {{ item }}折
+                            </div>
+                        </li>
+                    </ul>
                 </div>
                 <keyboard-package
                     :disableDot="inputType === 1"
@@ -200,6 +210,7 @@ export default {
                 4: "", // 微信
             },
             // 折扣
+            discountList: [], // 折扣列表
             discountVisibile: false,
             discount: {
                 show: false,
@@ -215,10 +226,23 @@ export default {
         if (!this.goods) {
             this.router.back();
         }
+        this.getConfig();
     },
     async onShow() {},
     // 函数
     methods: {
+        getConfig() {
+            this.api
+                .get("/Store/GetStoreConfig", {
+                    id: this.user.storeId,
+                })
+                .then((res) => {
+                    let data = res.data;
+                    if (data.orderConfig && data.orderConfig.discountList) {
+                        this.discountList = data.orderConfig.discountList;
+                    }
+                });
+        },
         showPay(type) {
             this.curPayType = type;
             if (type === "1") {
@@ -345,13 +369,19 @@ export default {
             );
         },
 
+        // 打折点击
+        disItemClick(val) {
+            this.discount.ratio = val;
+            this.computeDiscountValue();
+        },
+
         submit() {
             if (this.btnLoading) {
                 return;
             }
             let sendData = {
-                totalAmount: this.totalPrice * 100,
-                payAmount: this.payAmount * 100,
+                totalAmount: parseInt(this.totalPrice * 100),
+                payAmount: parseInt(this.payAmount * 100),
                 discount: this.discount.show
                     ? Number(this.discount.ratio)
                     : 100, // 折扣
@@ -362,7 +392,7 @@ export default {
                 sendData.orderItems.push({
                     productId: item.id,
                     // skuId:item.id,
-                    skuId: item._sku?item._sku.skuId:'',
+                    skuId: item._sku ? item._sku.skuId : "",
                     count: item.select_num,
                     remark: "",
                 });
@@ -401,9 +431,9 @@ export default {
             let n = 0;
             for (let item of this.goods) {
                 if (item._sku) {
-                    n += item._sku.price / 100 * item.select_num;
+                    n += (item._sku.price / 100) * item.select_num;
                 } else {
-                    n += item.price / 100 * item.select_num;
+                    n += (item.price / 100) * item.select_num;
                 }
             }
             return n;
@@ -678,4 +708,24 @@ export default {
     justify-content: center;
     align-items: center;
 }
+.dis-list {
+    display: flex;
+    background-color: #eee;
+    flex-wrap: wrap;
+    padding: px(20) px(10) px(1);
+    margin: px(30) px(-35) 0;
+    li {
+        width: 25%;
+        padding: 0 px(10);
+        margin-bottom: px(20);
+    }
+    .box {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: px(90);
+        border-radius: px(8);
+        background-color: #fff;
+    }
+}
 </style>

src/pages/manage/index.vue

@@ -49,6 +49,7 @@
                     ></my-image>
                     <span class="text">收银</span>
                 </li>
+              
             </ul>
         </div>
 
@@ -101,6 +102,7 @@ export default {
     },
     // 函数
     methods: {
+
         getUserMenu() {
             uni.showLoading({
                 title: "加载中...",