Merge branch 'master' of https://e.coding.net/g-cphe0354/cashier/cashier-web into dwb

2025-03-12 17:25:23 +08:00 · 2025-03-12 17:25:23 +08:00 · 47def973b4
parent aeb4268a56 0e4050c3e5
commit 47def973b4
8 changed files with 178 additions and 116 deletions
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@ -114,6 +114,9 @@ export const useUserStore = defineStore("user", () => {
   */
  function clearUserData() {
    return new Promise<void>((resolve) => {
+      userInfo.value = {} as UserInfo
+      meituan_douyin_info.value = {}
+      isShopAdmin.value = false
      clearToken();
      usePermissionStoreHook().resetRouter();
      useDictStoreHook().clearDictionaryCache();
--- a/src/views/application/marketing/share/components/share.vue
+++ b/src/views/application/marketing/share/components/share.vue
@ -359,7 +359,7 @@ export default {
          background-color: #fff;
          position: absolute;
          top: 10px;
-          right: $size / 2 * -1;
+          right: calc(-1 * ($size / 2));
          transform: rotate(-45deg);
        }

--- a/src/views/data/index.vue
+++ b/src/views/data/index.vue
@ -53,13 +53,13 @@
        </div>
        <div class="time_wrap">
          <el-radio-group v-model="timeValue" @change="timeChange">
-            <el-radio-button label="0">今天</el-radio-button>
-            <el-radio-button label="-1">昨天</el-radio-button>
-            <el-radio-button label="-7">最近7天</el-radio-button>
-            <el-radio-button label="-30">最近30天</el-radio-button>
-            <el-radio-button label="week">本周</el-radio-button>
-            <el-radio-button label="month">本月</el-radio-button>
-            <el-radio-button label="custom">自定义</el-radio-button>
+            <el-radio-button value="0">今天</el-radio-button>
+            <el-radio-button value="-1">昨天</el-radio-button>
+            <el-radio-button value="-7">最近7天</el-radio-button>
+            <el-radio-button value="-30">最近30天</el-radio-button>
+            <el-radio-button value="week">本周</el-radio-button>
+            <el-radio-button value="month">本月</el-radio-button>
+            <el-radio-button value="custom">自定义</el-radio-button>
          </el-radio-group>
          <el-date-picker
            v-model="query.createdAt"
@ -77,7 +77,7 @@
        <div class="top">
          <div class="item earnings">
            <div class="num_wrap">
-              <div class="num">{{ formatDecimal(trade.saleAmount || 0) }}</div>
+              <div class="num">{{ formatDecimal(yingyeShiShou || 0) }}</div>
              <div class="tips">
                营业实收（元）
                <el-tooltip popper-class="popper" effect="light" placement="bottom">
@ -88,35 +88,42 @@
                          <img class="icon" src="@/assets/images/data/wx.png" />
                          <span>微信小程序</span>
                        </div>
-                        <span class="num">{{ trade.wechatPayCount }}</span>
+                        <span class="num">{{ trade.wechatPayAmount }}</span>
                      </div>
                      <div class="item">
                        <div class="left">
                          <img class="icon" src="@/assets/images/data/ali.png" />
                          <span>支付宝小程序</span>
                        </div>
-                        <span class="num">{{ trade.aliPayCount }}</span>
+                        <span class="num">{{ trade.aliPayAmount }}</span>
                      </div>
                      <div class="item">
                        <div class="left">
                          <img class="icon" src="@/assets/images/data/scan.png" />
                          <span>主扫收款</span>
                        </div>
-                        <span class="num">{{ trade.scanPayCount }}</span>
+                        <span class="num">{{ trade.scanPayAmount }}</span>
                      </div>
                      <div class="item">
                        <div class="left">
                          <img class="icon" src="@/assets/images/data/cash.png" />
                          <span>现金</span>
                        </div>
-                        <span class="num">{{ trade.cashPayCount }}</span>
+                        <span class="num">{{ trade.cashPayAmount }}</span>
+                      </div>
+                      <div class="item">
+                        <div class="left">
+                          <img class="icon" src="@/assets/images/data/cash.png" />
+                          <span>充值</span>
+                        </div>
+                        <span class="num">{{ trade.rechargeAmount }}</span>
                      </div>
                      <div class="item">
                        <div class="left">
                          <img class="icon" src="@/assets/images/data/cash.png" />
                          <span>挂账</span>
                        </div>
-                        <span class="num">{{ trade.creditPayCount }}</span>
+                        <span class="num">{{ trade.creditPayAmount }}</span>
                      </div>
                    </div>
                  </template>
@ -135,7 +142,9 @@
                    class="gropress l"
                    :style="{
                      width: `${
-                        trade.refundAmount ? (trade.refundAmount / trade.saleAmount) * 100 : 0
+                        trade.saleAmount
+                          ? (trade.saleAmount / (trade.saleAmount * 1 + trade.refundAmount)) * 100
+                          : 0
                      }%`,
                    }"
                  ></div>
@ -143,7 +152,9 @@
                    class="gropress r"
                    :style="{
                      width: `${
-                        trade.refundAmount ? (trade.refundAmount / trade.saleAmount) * 100 : 0
+                        trade.refundAmount
+                          ? (trade.refundAmount / (trade.saleAmount * 1 + trade.refundAmount)) * 100
+                          : 0
                      }%`,
                    }"
                  ></div>
@ -203,7 +214,7 @@
            <div class="data_item_right">
              <div class="t">
                <span>新增会员数</span>
-                <span class="n">{{ 0 }}(人)</span>
+                <span class="n">{{ trade.newMemberCoun || 0 }}(人)</span>
              </div>
              <div class="t">
                <span>会员消费笔数</span>
@ -274,8 +285,8 @@
            </div>
          </div>
          <el-radio-group v-model="saleActive" @change="lineChartTypeChange(lineChartType)">
-            <el-radio-button label="7">近7天</el-radio-button>
-            <el-radio-button label="30">30天</el-radio-button>
+            <el-radio-button value="7">近7天</el-radio-button>
+            <el-radio-button value="30">30天</el-radio-button>
          </el-radio-group>
        </div>
        <div
@ -301,8 +312,8 @@
          </div>
          <el-radio-group v-model="saleTableActive" @change="rankChange">
            <!-- <el-radio-button label="1">今天</el-radio-button> -->
-            <el-radio-button label="7">近7天</el-radio-button>
-            <el-radio-button label="30">30天</el-radio-button>
+            <el-radio-button value="7">近7天</el-radio-button>
+            <el-radio-button value="30">30天</el-radio-button>
          </el-radio-group>
        </div>
        <div class="sale_data">
@ -451,6 +462,21 @@ export default {
      tradeCount: "",
    };
  },
+  computed: {
+    yingyeShiShou() {
+      if (!this.trade) {
+        return 0;
+      }
+      return (
+        this.trade.wechatPayAmount * 1 +
+        this.trade.aliPayAmount * 1 +
+        this.trade.aliPayAmount * 1 +
+        this.trade.memberPayAmount * 1 +
+        this.trade.scanPayAmount * 1 +
+        this.trade.cashPayAmount * 1
+      );
+    },
+  },
  mounted() {
    // 增加首页提示是否账号30天过期
    let date = dayjs(localStorage.getItem("expireDate")).diff(dayjs().format("YYYY-MM-DD"), "day");
@ -780,9 +806,7 @@ export default {
            axisLabel: {
              rotate: time.length <= 7 ? 0 : 45,
              interval: 0,
-              textStyle: {
-                fontSize: "9",
-              },
+              fontSize: "9",
            },
          },
        ],
@ -1113,14 +1137,6 @@ export default {
    async summaryDateGet(res) {
      try {
        console.log(res);
-
-        // const res = await summaryDateGet(this.saleTableActive);
-        let p1 = [res.map((item) => item.tradeDay), res.map((item) => item.saleNum)];
-        let p2 = [res.map((item) => item.tradeDay), res.map((item) => item.saleAmount)];
-
-        // console.log(p1);
-        // console.log(p2);
-
        // this.initProduceChart(p1, p2);
      } catch (error) {
        console.log(error);
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@ -1,75 +1,88 @@
 <template>
  <div class="app-container">
    <!-- 列表 -->
-    <template v-if="isA">
-      <!-- 搜索 -->
-      <page-search ref="searchRef" :search-config="searchConfig" @query-click="handleQueryClick"
-        @reset-click="handleResetClick" />
-      <!-- 顶部数据 -->
-      <Statistics></Statistics>
-      <!-- 列表 -->
-      <page-content ref="contentRef" :content-config="contentConfig" @add-click="handleAddClick"
-        @edit-click="handleEditClick" @export-click="handleExportClick" @search-click="handleSearchClick"
-        @toolbar-click="handleToolbarClick" @operat-click="handleOperatClick" @filter-change="handleFilterChange">
-        <!-- <template #status="scope">
+    <!-- 搜索 -->
+    <page-search
+      ref="searchRef"
+      :search-config="searchConfig"
+      @query-click="handleQueryClick"
+      @reset-click="handleResetClick"
+    />
+    <!-- 顶部数据 -->
+    <Statistics></Statistics>
+    <!-- 列表 -->
+    <page-content
+      ref="contentRef"
+      :content-config="contentConfig"
+      @add-click="handleAddClick"
+      @edit-click="handleEditClick"
+      @export-click="handleExportClick"
+      @search-click="handleSearchClick"
+      @toolbar-click="handleToolbarClick"
+      @operat-click="handleOperatClick"
+      @filter-change="handleFilterChange"
+    >
+      <!-- <template #status="scope">
          <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
            {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
          </el-tag>
        </template> -->
-        <template #type="scope">
-          {{ typeFilter(scope.row[scope.prop]) }}
-        </template>
-        <template #gender="scope">
-          <DictLabel v-model="scope.row[scope.prop]" code="gender" />
-        </template>
-        <template #shangjia="scope">
-          <el-switch v-model="scope.row[scope.prop]" :active-value="1" :inactive-value="0"
-            @click="handleSwitchChange(scope.row)"></el-switch>
-        </template>
-        <template #mobile="scope">
-          <el-text>{{ scope.row[scope.prop] }}</el-text>
-          <copy-button v-if="scope.row[scope.prop]" :text="scope.row[scope.prop]" style="margin-left: 2px" />
-        </template>
-      </page-content>
+      <template #type="scope">
+        {{ typeFilter(scope.row[scope.prop]) }}
+      </template>
+      <template #gender="scope">
+        <DictLabel v-model="scope.row[scope.prop]" code="gender" />
+      </template>
+      <template #shangjia="scope">
+        <el-switch
+          v-model="scope.row[scope.prop]"
+          :active-value="1"
+          :inactive-value="0"
+          @click="handleSwitchChange(scope.row)"
+        ></el-switch>
+      </template>
+      <template #mobile="scope">
+        <el-text>{{ scope.row[scope.prop] }}</el-text>
+        <copy-button
+          v-if="scope.row[scope.prop]"
+          :text="scope.row[scope.prop]"
+          style="margin-left: 2px"
+        />
+      </template>
+    </page-content>

-      <!-- 新增 -->
-      <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
-        <template #gender="scope">
-          <Dict v-model="scope.formData[scope.prop]" code="gender" />
-        </template>
-      </page-modal>
+    <!-- 新增 -->
+    <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
+      <template #gender="scope">
+        <Dict v-model="scope.formData[scope.prop]" code="gender" />
+      </template>
+    </page-modal>

-      <!-- 编辑 -->
-      <page-modal ref="editModalRef" :modal-config="editModalConfig" @submit-click="handleSubmitClick">
-        <template #gender="scope">
-          <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
-        </template>
-      </page-modal>
+    <!-- 编辑 -->
+    <page-modal
+      ref="editModalRef"
+      :modal-config="editModalConfig"
+      @submit-click="handleSubmitClick"
+    >
+      <template #gender="scope">
+        <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
+      </template>
+    </page-modal>

-      <!-- 库存预警设置 -->
-      <MyDialog ref="myDialogRef" @confirm="confirm" title="修改库存预警">
-        <el-form :model="form">
-          <el-form-item label="库存预警" label-width="">
-            <el-input-number v-model="form.num" label="描述文字"></el-input-number>
-          </el-form-item>
-        </el-form>
-      </MyDialog>
-    </template>
-    <template v-else>
-      <!-- <page-content ref="contentRef" :content-config="contentConfig2" @operat-click="handleOperatClick">
-        <template #status="scope">
-          <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
-            {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
-          </el-tag>
-        </template>
-</page-content> -->
-    </template>
+    <!-- 库存预警设置 -->
+    <MyDialog ref="myDialogRef" @confirm="confirm" title="修改库存预警">
+      <el-form :model="form">
+        <el-form-item label="库存预警" label-width="">
+          <el-input-number v-model="form.num" label="描述文字"></el-input-number>
+        </el-form-item>
+      </el-form>
+    </MyDialog>
  </div>
 </template>

 <script setup lang="ts">
 import UserAPI from "@/api/product/index";
-import { useRouter } from 'vue-router';
+import { useRouter } from "vue-router";
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./indexconfig/add";
@ -96,13 +109,13 @@ const {
 const router = useRouter();

 const form = reactive({
-  num: '',
-})
+  num: "",
+});
 // 新增
 async function handleAddClick() {
-  router.push({ name: 'addgoods' });
+  router.push({ name: "addgoods" });
  // addModalRef.value?.setModalVisible();
-  // 加载上级规格下拉数据源 
+  // 加载上级规格下拉数据源
  // addModalConfig.formItems[2]!.attrs!.data = await UserAPI.getPage({ name: "" });
  // 加载角色下拉数据源
  // addModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
@ -110,35 +123,41 @@ async function handleAddClick() {
 // 上架
 function handleSwitchChange(data: any) {
  let obj = {
-    type: data.isGrounding ? 'sku' : 'product',
+    type: data.isGrounding ? "sku" : "product",
    id: data.id,
-    isSale: data.isSale
-  }
+    isSale: data.isSale,
+  };
  UserAPI.onOff(obj);
 }
 // 编辑
 async function handleEditClick(row: IObject) {
-  router.push({ name: 'addgoods', query: { goods_id: row.id } });
+  router.push({ name: "addgoods", query: { goods_id: row.id } });
 }
-const myDialogRef = ref(null)
+const myDialogRef = ref(null);
 // 其他工具栏
 function handleToolbarClick(name: string) {
  console.log(name);
  if (name === "custom1") {
    // ElMessage.success("点击了自定义1按钮");
-    myDialogRef.value.open()
+    myDialogRef.value.open();
  }
 }
 function confirm() {
-  console.log(form, 'debug')
+  console.log(form, "debug");
 }
 // 商品规格
 function typeFilter(item: any) {
-  if (item == 'single') { return '单规格' }
-  else if (item == 'sku') { return '多规格' }
-  else if (item == 'package') { return '套餐商品' }
-  else if (item == 'weight') { return '称重商品' }
-  else if (item == 'coupon') { return '团购券' }
+  if (item == "single") {
+    return "单规格";
+  } else if (item == "sku") {
+    return "多规格";
+  } else if (item == "package") {
+    return "套餐商品";
+  } else if (item == "weight") {
+    return "称重商品";
+  } else if (item == "coupon") {
+    return "团购券";
+  }
 }
 // 其他操作列
 async function handleOperatClick(data: IOperatData) {
@ -175,6 +194,11 @@ async function handleOperatClick(data: IOperatData) {
  }
 }

-// 切换示例
-const isA = ref(true);
+const route = useRoute();
+onMounted(() => {
+  console.log(route.query);
+  if (route.query.id) {
+    contentRef.value?.fetchPageData({ id: route.query.id });
+  }
+});
 </script>
--- a/src/views/shop/log/config/content.ts
+++ b/src/views/shop/log/config/content.ts
@ -51,11 +51,11 @@ const contentConfig: IContentConfig = {
      align: "center",
      prop: "operation",
    },
-    {
-      label: "请求Url",
-      align: "center",
-      prop: "requestUri",
-    },
+    // {
+    //   label: "请求Url",
+    //   align: "center",
+    //   prop: "requestUri",
+    // },
    {
      label: "请求耗时",
      align: "center",
--- a/src/views/system-setting/pay-types/config/config.ts
+++ b/src/views/system-setting/pay-types/config/config.ts
@ -16,7 +16,6 @@ const options: optionObject = {
    { label: "刷卡", value: "deposit" },
    { label: "挂单", value: "arrears" },
    { label: "刷卡", value: "deposit" },
-    { label: "储值", value: "member-account" },
    { label: "自定义", value: "virtual" },
  ],
  isIdeal: [
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@ -385,11 +385,15 @@ async function createOrder(key) {

      showOrder.value = true;
      if (key == "wx-aiplay") {
-        refOrder.value.nowPayClick("scanCode");
+        nextTick(() => {
+          refOrder.value.nowPayClick("scanCode");
+        });
        return;
      }
      if (key == "cash") {
-        refOrder.value.nowPayClick("cash");
+        nextTick(() => {
+          refOrder.value.nowPayClick("cash");
+        });
      }
      // oldOrder.value = res;
    }
--- a/src/views/tool/table/index.vue
+++ b/src/views/tool/table/index.vue
@ -227,6 +227,8 @@

 <script setup>
 import status from "./status.js";
+import { useUserStore } from "@/store/modules/user";
+const shopUser = useUserStore();
 const router = useRouter();
 import shopAreaApi from "@/api/account/shopArea";
 import tableApi from "@/api/account/table";
@ -254,7 +256,21 @@ function formatTime(milliseconds) {
 }

 function downloadTableCpde() {}
-function downloadShopCpde() {}
+function downloadShopCpde() {
+  try {
+    const link = document.createElement("a");
+    link.href = shopUser.userInfo.smallQrcode;
+    const fileName = shopUser.userInfo.shopName + "店铺码" + ".png";
+    console.log(fileName);
+    link.setAttribute("download", fileName);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+    this.$message.success("下载成功");
+  } catch (error) {
+    console.log(error);
+  }
+}

 // 台桌