代码合并

src/store/modules/carts.ts

@@ -226,9 +226,27 @@ export const useCartsStore = defineStore("carts", () => {
   const isLinkFinshed = ref(false);
 
   // 当前购物车数据（现在 getAllGoodsList 能直接访问）
-  const list = useStorage<any[]>("carts", []);
+  const list = useStorage<any[]>(
-  // 历史订单数据（现在 getAllGoodsList 能直接访问），不从本地缓存获取，改为从接口获取
+    "carts",
-  const oldOrder = ref<any>({
+    [],
+    localStorage,
+    {
+      serializer: {
+        read: (rawValue) => {
+          // 没有值时直接返回默认空数组
+          if (!rawValue) return []
+          try {
+            return JSON.parse(rawValue)
+          } catch {
+            return []
+          }
+        },
+        write: (value) => JSON.stringify(value),
+      },
+    }
+  )
+  // 历史订单数据（现在 getAllGoodsList 能直接访问）
+  const oldOrder = useStorage<any>("Instead_olold_order", {
     detailMap: [],
     originAmount: 0
   });

src/views/shop/config/components/shopInfo.vue

@@ -3,14 +3,25 @@
     <div>
       <el-form ref="form" :model="form" :rules="rules" label-width="160px" label-position="left">
         <el-form-item label="门店名称" prop="shopName">
-          <el-input v-model.trim="form.shopName" placeholder="请输入门店名称" style="width: 500px"></el-input>
+          <el-input
+            v-model.trim="form.shopName"
+            placeholder="请输入门店名称"
+            style="width: 500px"
+          ></el-input>
         </el-form-item>
         <el-form-item label="连锁店扩展店名">
-          <el-input v-model.trim="form.chainName" placeholder="请输入连锁店扩展店名" style="width: 500px"></el-input>
+          <el-input
+            v-model.trim="form.chainName"
+            placeholder="请输入连锁店扩展店名"
+            style="width: 500px"
+          ></el-input>
         </el-form-item>
         <el-form-item label="门店logo">
           <div class="img_box">
-            <single-image-upload style="width: 80px; height: 80px" v-model="form.logo"></single-image-upload>
+            <single-image-upload
+              style="width: 80px; height: 80px"
+              v-model="form.logo"
+            ></single-image-upload>
           </div>
         </el-form-item>
         <!-- <el-form-item label="门店照片">
@@ -27,14 +38,22 @@
         <el-form-item label="门店收款码">
           <div class="img_box">
             <canvas ref="canvas" id="QRCode_header" style="width: 80px; height: 80px"></canvas>
-            <el-button size="small" plain v-if="form.paymentQrcode" @click="downloadCanvas(form.paymentQrcode)">
+            <el-button
+              size="small"
+              plain
+              v-if="form.paymentQrcode"
+              @click="downloadCanvas(form.paymentQrcode)"
+            >
               下载
             </el-button>
           </div>
         </el-form-item>
         <el-form-item label="微信二维码">
           <div class="img_box">
-            <single-image-upload style="width: 80px; height: 80px" v-model="form.shopQrcode"></single-image-upload>
+            <single-image-upload
+              style="width: 80px; height: 80px"
+              v-model="form.shopQrcode"
+            ></single-image-upload>
           </div>
         </el-form-item>
         <!-- <el-form-item label="店铺小程序码">
@@ -52,6 +71,21 @@
             <el-radio value="after">餐饮版（先下单后支付）</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item
+          label="是否允许用户自行支付"
+          prop="isUserPay"
+          v-if="form.registerType === 'after'"
+        >
+          <div class="column">
+            <div class="center" style="display: flex; align-items: center; gap: 14px">
+              <el-switch v-model="form.isUserPay" :active-value="1" :inactive-value="0"></el-switch>
+              <div class="tips" style="font-size: 14px; color: #999">
+                关闭后，用户将不能自行支付
+              </div>
+            </div>
+          </div>
+        </el-form-item>
+
         <el-form-item label="就餐模式「多选」" prop="eatModel">
           <el-checkbox-group v-model="form.eatModel">
             <el-checkbox value="dine-in">堂食自取</el-checkbox>
@@ -65,7 +99,11 @@
           </el-radio-group>
         </el-form-item> -->
         <el-form-item label="联系电话" prop="phone">
-          <el-input v-model.trim="form.phone" placeholder="请输入联系电话" style="width: 500px"></el-input>
+          <el-input
+            v-model.trim="form.phone"
+            placeholder="请输入联系电话"
+            style="width: 500px"
+          ></el-input>
         </el-form-item>
         <!-- <el-form-item label="外卖起送金额">
                     <el-input-number v-model="form.takeaway_money" placeholder="0.00" controls-position="right"
@@ -91,30 +129,62 @@
           <div style="color: #999">注：准确的定位便于用户导航到店铺</div>
         </el-form-item>
         <el-form-item label="门店详细地址">
-          <el-input type="textarea" v-model.trim="form.address" placeholder="请输入门店详细地址" style="width: 500px"></el-input>
+          <el-input
+            type="textarea"
+            v-model.trim="form.address"
+            placeholder="请输入门店详细地址"
+            style="width: 500px"
+          ></el-input>
         </el-form-item>
         <el-form-item label="营业时间">
           <div class="u-flex gap-2" style="width: 50%">
             <el-select v-model="form.businessStartDay" placeholder="周几开始">
-              <el-option :value="item.label" :label="item.label" v-for="item in weeks" :key="item.value"></el-option>
+              <el-option
+                :value="item.label"
+                :label="item.label"
+                v-for="item in weeks"
+                :key="item.value"
+              ></el-option>
             </el-select>
             <el-select v-model="form.businessEndDay" placeholder="周几结束">
-              <el-option :value="item.label" :label="item.label" v-for="item in weeks" :key="item.value"></el-option>
+              <el-option
+                :value="item.label"
+                :label="item.label"
+                v-for="item in weeks"
+                :key="item.value"
+              ></el-option>
             </el-select>
-            <el-time-picker placeholder="起始时间" v-model="startTime" :picker-options="{
+            <el-time-picker
-              selectableRange: '00:00:00 - 23:59:59',
+              placeholder="起始时间"
-              format: 'HH:mm',
+              v-model="startTime"
-            }" format="HH:mm" value-format="HH:mm"></el-time-picker>
+              :picker-options="{
-            <el-time-picker placeholder="结束时间" v-model="endTime" :picker-options="{
+                selectableRange: '00:00:00 - 23:59:59',
-              selectableRange: '00:00:00 - 23:59:59',
+                format: 'HH:mm',
-            }" format="HH:mm" value-format="HH:mm"></el-time-picker>
+              }"
+              format="HH:mm"
+              value-format="HH:mm"
+            ></el-time-picker>
+            <el-time-picker
+              placeholder="结束时间"
+              v-model="endTime"
+              :picker-options="{
+                selectableRange: '00:00:00 - 23:59:59',
+              }"
+              format="HH:mm"
+              value-format="HH:mm"
+            ></el-time-picker>
           </div>
         </el-form-item>
         <el-form-item label="桌位费/位/元">
           <el-input-number :disabled="!!form.isTableFee" v-model="form.tableFee" :min="0" />
           <!-- <el-checkbox v-model="form.isTableFee" :label="1">免餐位费</el-checkbox> -->
-          <el-switch class="u-m-l-10" v-model.trim="form.isTableFee" :active-value="1" :inactive-value="0"
+          <el-switch
-            active-text="免餐位费"></el-switch>
+            class="u-m-l-10"
+            v-model.trim="form.isTableFee"
+            :active-value="1"
+            :inactive-value="0"
+            active-text="免餐位费"
+          ></el-switch>
         </el-form-item>
         <!-- <el-form-item label="是否开启8折活动">
           <el-switch v-model.trim="form.isOpenYhq" active-value="true" inactive-value="false"></el-switch>
@@ -148,42 +218,68 @@
           </el-time-picker>
         </el-form-item> -->
         <el-form-item label="店铺简介">
-          <el-input type="textarea" v-model.trim="form.detail" placeholder="请输入店铺简介" style="width: 500px"></el-input>
+          <el-input
+            type="textarea"
+            v-model.trim="form.detail"
+            placeholder="请输入店铺简介"
+            style="width: 500px"
+          ></el-input>
         </el-form-item>
         <el-form-item label="台桌预订短信">
-          <el-input type="textarea" v-model.trim="form.bookingSms" placeholder="请输入台桌预订短信"
+          <el-input
-            style="width: 500px"></el-input>
+            type="textarea"
+            v-model.trim="form.bookingSms"
+            placeholder="请输入台桌预订短信"
+            style="width: 500px"
+          ></el-input>
         </el-form-item>
         <el-form-item label="电子围栏" prop="isOrderFence">
           <div class="column">
             <div class="center" style="display: flex; align-items: center; gap: 14px">
-              <el-switch v-model="form.isOrderFence" :active-value="1" :inactive-value="0"></el-switch>
+              <el-switch
+                v-model="form.isOrderFence"
+                :active-value="1"
+                :inactive-value="0"
+              ></el-switch>
               <div class="tips" style="font-size: 14px; color: #999">
                 开启后，用户只能在店铺附近xx公里内点餐
               </div>
             </div>
             <div class="center" v-if="form.isOrderFence == 1">
-              <el-input v-model="form.orderFenceDistance" placeholder="请输入"
+              <el-input
-                @input="(e) => (form.orderFenceDistance = filterNumberInput(e))" style="width: 250px"
+                v-model="form.orderFenceDistance"
-                input-style="text-align: center;">
+                placeholder="请输入"
+                @input="(e) => (form.orderFenceDistance = filterNumberInput(e))"
+                style="width: 250px"
+                input-style="text-align: center;"
+              >
                 <template #prepend>限制：</template>
                 <template #append>公里</template>
               </el-input>
             </div>
           </div>
         </el-form-item>
+
         <el-form-item label="上菜时间（分钟）" prop="isServeTimeControl">
           <div class="column">
             <div class="center" style="display: flex; align-items: center; gap: 14px">
-              <el-switch v-model="form.isServeTimeControl" :active-value="1" :inactive-value="0"></el-switch>
+              <el-switch
+                v-model="form.isServeTimeControl"
+                :active-value="1"
+                :inactive-value="0"
+              ></el-switch>
               <div class="tips" style="font-size: 14px; color: #999">
                 起菜到上菜的时间间隔，开启后会有超时提示
               </div>
             </div>
             <div class="center" v-if="form.isServeTimeControl == 1">
-              <el-input v-model="form.serveTime" placeholder="请输入"
+              <el-input
-                @input="(e) => (form.serveTime = filterNumberInput(e))" style="width: 250px"
+                v-model="form.serveTime"
-                input-style="text-align: center;">
+                placeholder="请输入"
+                @input="(e) => (form.serveTime = filterNumberInput(e))"
+                style="width: 250px"
+                input-style="text-align: center;"
+              >
                 <template #prepend>限制：</template>
                 <template #append>分钟</template>
               </el-input>
@@ -208,11 +304,24 @@
       </el-form>
     </div>
     <ChooseAddress ref="refChooseAddress" @choose="chooseAddressConfirm"></ChooseAddress>
-    <el-dialog v-model="showUpload" :close-on-click-modal="false" append-to-body width="500px"
+    <el-dialog
-      @close="showUpload = false">
+      v-model="showUpload"
-      <el-upload :before-remove="handleBeforeRemove" :on-success="handleSuccess" :on-error="handleError"
+      :close-on-click-modal="false"
-        :file-list="fileList" :headers="headers" :action="qiNiuUploadApi" :limit="1" list-type="picture"
+      append-to-body
-        class="upload-demo">
+      width="500px"
+      @close="showUpload = false"
+    >
+      <el-upload
+        :before-remove="handleBeforeRemove"
+        :on-success="handleSuccess"
+        :on-error="handleError"
+        :file-list="fileList"
+        :headers="headers"
+        :action="qiNiuUploadApi"
+        :limit="1"
+        list-type="picture"
+        class="upload-demo"
+      >
         <el-button size="small" type="primary">点击上传</el-button>
         <template #tip>
           <div style="display: block" class="el-upload__tip">请勿上传违法文件，且文件不超过15M</div>
@@ -341,6 +450,14 @@ export default {
   mounted() {
     this.tbShopInfo();
   },
+  watch: {
+    "form.registerType"(val) {
+      console.log(val);
+      if (val === "before") {
+        this.form.isUserPay = 1;
+      }
+    },
+  },
   methods: {
     chooseAddressConfirm(e) {
       console.log(e);
@@ -459,7 +576,7 @@ export default {
     handleBeforeRemove(file, fileList) {
       for (let i = 0; i < this.files.length; i++) {
         if (this.files[i].uid === file.uid) {
-          crudQiNiu.del([this.files[i].id]).then((res) => { });
+          crudQiNiu.del([this.files[i].id]).then((res) => {});
           return true;
         }
       }