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

src/components/mycomponents/addImgconfig/mypagination.vue

@@ -1,12 +1,16 @@
 <template>
   <div class="mypagination">
-    <i class="el-icon-arrow-left istyle" @click="minuspage" v-show="pgae != 1"></i>
+    <el-icon class="istyle" @click="minuspage" v-show="pgae != 1">
+      <ArrowLeft />
+    </el-icon>
     <div>
       <span style="color: #42d885;">
         {{ pgae }}
       </span> / {{ totals }}
     </div>
-    <i class="el-icon-arrow-right istyle" @click="gopage" v-if="pgae != totals"></i>
+    <el-icon class="istyle" @click="gopage" v-if="pgae != totals">
+      <ArrowRight />
+    </el-icon>
     <div style="width: 26px;" v-else></div>
     <el-input v-model='pagego' class="inputStyle" @input="oninputEvent" />
     <el-button type="text" @click="gopages">跳转</el-button>

src/views/data/workconfig/component/my-table.vue

@@ -1,13 +1,13 @@
 <template>
   <div style="margin-top: 10px;">
     <el-table :data="props.list" border style="width: 100%">
-      <el-table-column prop="date" align="center" label="商户名称" />
+      <el-table-column prop="shopName" align="center" label="商户名称" />
       <el-table-column prop="staffName" align="center" label="职员名称" />
       <el-table-column prop="orderCount" align="center" label="订单数量" />
-      <el-table-column prop="date" align="center" label="应交金额" />
+      <el-table-column prop="handAmount" align="center" label="应交金额" />
       <el-table-column prop="quickInAmount" align="center" label="快捷收款金额" />
       <el-table-column prop="refundAmount" align="center" label="退款金额" />
-      <el-table-column prop="date" align="center" label="总收入" />
+      <el-table-column prop="handAmount" align="center" label="总收入" />
       <el-table-column prop="loginTime" align="center" label="开始时间" />
       <el-table-column prop="handoverTime" align="center" label="交班时间" />
       <el-table-column label="操作" align="center">

src/views/data/workconfig/my-content.vue

@@ -1,69 +1,17 @@
 <template>
   <div class="Table">
     <!-- 表格 -->
-    <my-table
+    <my-table :list="datas.tableData" @handleDelete="handleDelete" @handleEdit="handleEdit"></my-table>
-      :list="datas.tableData"
-      @handleDelete="handleDelete"
-      @handleEdit="handleEdit"
-    ></my-table>
     <!-- 分页 -->
-    <my-paging
+    <my-paging :pagingConfig="datas.pagingConfig" @sizeChange="sizeChange" @currentChange="currentChange"></my-paging>
-      :pagingConfig="datas.pagingConfig"
-      @sizeChange="sizeChange"
-      @currentChange="currentChange"
-    ></my-paging>
     <!-- 其他模板 -->
     <!-- 新增/编辑 -->
-    <my-dialog ref="myDialogRef" :title="datas.title" @confirm="confirm" width="30%">
+    <my-dialog ref="myDialogRef" title="商品销售" @confirm="confirm" width="30%">
-      <el-form ref="ruleFormRef" :rules="datas.rules" :model="datas.DialogForm" label-width="80px">
+      <el-table :data="datas.tableDatas" style="width: 100%">
-        <el-form-item label="商品图片" required prop="images">
+        <el-table-column prop="productName" label="商品名称" />
-          <div style="display: flex; flex-wrap: wrap">
+        <el-table-column prop="num" label="数量" />
-            <div
+        <el-table-column prop="amount" label="金额" />
-              v-for="(item, index) in datas.DialogForm.images"
+      </el-table>
-              :key="index"
-              style="position: relative"
-              class="showStyle"
-            >
-              <el-icon class="buttonstyle" @click="deleteEvent(item)">
-                <DeleteFilled />
-              </el-icon>
-              <img
-                style="width: 148px; height: 148px; margin-right: 6px"
-                class="imgStyle"
-                :src="item"
-                alt=""
-              />
-            </div>
-            <div class="upImgStyle" @click="addimgEvent">+</div>
-          </div>
-        </el-form-item>
-        <el-form-item label="适用群体">
-          <el-radio-group v-model="datas.DialogForm.deductionGroup">
-            <el-radio label="全部" value="all" />
-            <el-radio label="仅会员" value="vip" />
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="联系电话">
-          <el-input v-model="datas.DialogForm.telephone" placeholder="请输入联系电话" />
-        </el-form-item>
-        <el-form-item label="开启下单积分抵扣">
-          <el-switch
-            v-model="datas.DialogForm.enableDeduction"
-            :active-value="1"
-            :inactive-value="0"
-          />
-        </el-form-item>
-        <el-form-item label="额外价格">
-          <el-col :span="3">
-            <el-input v-model="datas.DialogForm.minPaymentAmount" type="number" placeholder="">
-              <template #append>元</template>
-            </el-input>
-          </el-col>
-        </el-form-item>
-        <el-form-item label="备注">
-          <el-input v-model="datas.DialogForm.remark" placeholder="请输入备注" type="textarea" />
-        </el-form-item>
-      </el-form>
     </my-dialog>
     <!-- 选择图片 -->
     <AddImg ref="addImg" @successEvent="successEvent"></AddImg>
@@ -78,6 +26,7 @@ import API from "./api";
 
 const datas = reactive({
   tableData: [], // 表格数据
+  tableDatas: [],
   title: "新增数据",
   pagingConfig: {
     total: 0, // 总数
@@ -130,36 +79,17 @@ function add() {
   myDialogRef.value.open();
 }
 async function handleEdit(row) {
-  datas.title = "编辑数据";
+  datas.title = "查看数据";
   const res = await API.getinfo(row.id);
-  datas.DialogForm = res;
+  datas.tableDatas = res
+  // datas.DialogForm = res;
   // 有图片
   // datas.DialogForm.goodsImageUrl = res.goodsImageUrl.split(',')
   myDialogRef.value.open();
 }
 async function confirm() {
-  ruleFormRef.value.validate(async (valid) => {
+  myDialogRef.value.close();
-    if (valid) {
+
-      let res = null;
-      if (datas.title == "新增数据") {
-        // 图片处理
-        // datas.DialogForm.goodsImageUrl = datas.DialogForm.goodsImageUrl.join(',')
-        res = await API.add(datas.DialogForm);
-      } else {
-        // datas.DialogForm.goodsImageUrl = datas.DialogForm.goodsImageUrl.join(',')
-        res = await API.update(datas.DialogForm);
-      }
-      if (res.code == 200) {
-        ElMessage({
-          message: "成功",
-          type: "success",
-        });
-        rest();
-        getList();
-        myDialogRef.value.close();
-      }
-    }
-  });
 }
 // 重置
 function rest() {

src/views/product/indexconfig/content.ts

@@ -53,8 +53,8 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   },
   exportsAction: async function (params) {
     // 模拟获取到的是全量数据
-    const res = await UserAPI.getPage(params);
+    // const res = await UserAPI.getPage(params);
-    return res.list;
+    // return res.list;
   },
   pk: "id",
   toolbar: [