Merge branch 'withdrawList-h5'

src/pages/Activity/Manage/index.vue

@@ -29,11 +29,11 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item style="margin-left: 50px">
-            <el-button type="primary" @click="getActivityList">搜索</el-button>
+          <el-form-item>
+            <el-button type="primary" size="small" @click="getActivityList">搜索</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" @click="goReleaseProduc"
+            <el-button type="primary" size="small" @click="goReleaseProduc"
               >发布拼单</el-button
             >
           </el-form-item>
@@ -88,13 +88,13 @@
               align="center"
               prop="scope"
               label="操作"
-              width="250"
+              fixed="right"
             >
               <template #default="scope">
                 <div class="button-one">
                   <el-button
                     type="primary"
-                    size="small"
+                    size="mini"
                     @click="handleModify(scope.row)"
                     >修改</el-button
                   >
@@ -106,7 +106,7 @@
                       <el-button
                         v-show="scope.row.status === 1"
                         type="primary"
-                        size="small"
+                        size="mini"
                         @click="handleEnd(scope.row)"
                         >结束</el-button
                       >
@@ -122,7 +122,7 @@
                           scope.row.status === 2 || scope.row.status === 3
                         "
                         type="primary"
-                        size="small"
+                        size="mini"
                         @click="handleStart(scope.row)"
                         >开始</el-button
                       >
@@ -133,7 +133,7 @@
                 <el-button
                   class="checkButton"
                   type="primary"
-                  size="small"
+                  size="mini"
                   @click="handleLook(scope.row)"
                   >查看订单</el-button
                 >
@@ -331,6 +331,7 @@ export default {
 <style lang="less" scoped>
 .manage-wrapper {
   height: 100%;
+  padding: 30px;
 }
 .header {
   height: 100%;

src/pages/Activity/releaseProduc/components/addProduc.vue

@@ -36,7 +36,7 @@
       <el-table-column prop="total_amount_sold" label="已售数量">
       </el-table-column>
       <el-table-column prop="inventory_rest" label="剩余库存"></el-table-column>
-      <el-table-column label="操作" width="120">
+      <el-table-column label="操作" fixed="right">
         <template #default="scope">
           <el-button
             type="text"
@@ -54,7 +54,7 @@
     <el-dialog
       :title="addCommodityTitle"
       v-model="addCommodityPopup"
-      width="40%"
+      width="60%"
     >
       <el-form
         :inline="true"
@@ -166,7 +166,7 @@
     <el-dialog
       title="选择商品"
       v-model="selCommodityPopup"
-      width="60%"
+      width="80%"
       top="2%"
     >
       <div>
@@ -212,7 +212,7 @@
           prop="inventory_rest"
           label="剩余库存"
         ></el-table-column>
-        <el-table-column label="操作" width="100">
+        <el-table-column label="操作" fixed="right">
           <template #default="scope">
             <el-button
               @click="commodity('update', scope.row)"
@@ -234,7 +234,7 @@
 </template>
 
 <script>
-import { GOODS_URI } from "../../../../../server/config";
+// import { GOODS_URI } from "../../../../../server/config";
 import { ElMessage } from "element-plus";
 import { getCookie } from "@/utils/util";
 
@@ -286,7 +286,7 @@ export default {
       picUrlList: [],
       picUploadList: [], // 上传详情图片列表
       isShowPopver: false, // 是否展示图片框
-      uploadUrl: `${GOODS_URI}/ksy/ks3apiunencrypt/ks3api_upload`, // 金山云上传地址
+      uploadUrl: `/api`, // 金山云上传地址
       hideUpload: false,
       limitCount: 1,
 
@@ -429,7 +429,7 @@ export default {
         marketing_name: this.editInfo.marketing_name,
         marketing_type: "4",
         ota_id: this.commodityForm.business1,
-        op_cur_user: getCookie('username'),
+        op_cur_user: getCookie("username"),
         // op_cur_user: store.state.userInfo.email,
         goods_sku_id: goodsSkuID,
       });
@@ -466,9 +466,11 @@ export default {
 
     // 添加修改商品
     async commodity(type, val) {
-      this.$refs.picUpload && this.$refs.picUpload.clearFiles && this.$refs.picUpload.clearFiles();
+      this.$refs.picUpload &&
+        this.$refs.picUpload.clearFiles &&
+        this.$refs.picUpload.clearFiles();
       this.picUrlList = [];
-      this.picStr = ''
+      this.picStr = "";
 
       this.addCommodityPopup = true;
       this.commodityForm = {};
@@ -497,7 +499,7 @@ export default {
         marketing_type: "4",
         price: this.commodityForm.price,
         ota_id: this.commodityForm.business1,
-        op_cur_user: getCookie('username'),
+        op_cur_user: getCookie("username"),
       });
       if (res.code == 0) {
         ElMessage.success({
@@ -596,12 +598,12 @@ export default {
       this.comTableData = newVal;
     },
     picUrlList: function () {
-      if(this.picUrlList.length >= this.limitCount) {
-        this.hideUpload = true
-      }else {
-        this.hideUpload = false
+      if (this.picUrlList.length >= this.limitCount) {
+        this.hideUpload = true;
+      } else {
+        this.hideUpload = false;
       }
-    }
+    },
   },
   created() {
     this.getBusinessListMet();

src/pages/Activity/releaseProduc/components/spellOrderSet.vue

@@ -34,15 +34,15 @@
     >
       <el-card class="card-block">
         <p>自提点设置</p>
-        <el-form ref="form" label-width="80px">
+        <el-form ref="form">
           <el-form-item>
             <el-input
               class="set"
               v-model="selfLiftingPoint"
               placeholder="自提点名称/自提点联系人"
             ></el-input>
-            <el-button type="primary" @click="getPlaceList">搜索</el-button>
-            <el-button type="primary" @click="dialogFormVisible = true"
+            <el-button type="primary" size="small" @click="getPlaceList">搜索</el-button>
+            <el-button type="primary" size="small" @click="dialogFormVisible = true"
               >添加自提点</el-button
             >
           </el-form-item>
@@ -93,7 +93,7 @@
                 prop="name"
                 align="center"
                 label="操作"
-                width="width"
+                fixed="right"
               >
                 <template #default="scope">
                   <el-popconfirm
@@ -103,7 +103,7 @@
                     <template #reference>
                       <el-button
                         type="primary"
-                        size="small"
+                        size="mini"
                         @click="handleDelete(scope.row)"
                         >删除</el-button
                       >
@@ -134,9 +134,9 @@
       title="添加自提点"
       v-model="dialogFormVisible"
       :show-close="false"
+      :width="isPc?'50%': '70%'"
     >
       <el-form
-        style="margin-left: 70px"
         :model="form"
         :rules="rules"
         ref="ruleForm"
@@ -165,7 +165,7 @@
             placeholder=""
             :disabled="true"
           ></el-input>
-          <el-button type="primary" @click="mapDialogVisible = true"
+          <el-button type="primary" @click="mapDialogVisible = true" size="mini"
             >从高德获取坐标</el-button
           >
         </el-form-item>
@@ -290,7 +290,8 @@ export default {
         province: "",
         city: "",
         area: ""
-      } // 添加自提点 详细信息
+      }, // 添加自提点 详细信息
+      isPc: document.documentElement.clientWidth > 600,
     };
   },
   computed: {
@@ -566,17 +567,17 @@ export default {
 }
 .set {
   width: 50%;
-  margin-top: 40px;
-}
-.el-button {
-  margin-left: 30px;
+  margin: 40px 20px 0 0;
 }
+// .el-button {
+//   margin-left: 30px;
+// }
 .tabList {
   margin-top: 10px;
 }
-.dialog-input {
-  width: 50%;
-}
+// .dialog-input {
+//   width: 50%;
+// }
 .location {
   margin-bottom: 10px;
   margin-left: 14%;

src/pages/Activity/releaseProduc/index.vue

@@ -223,11 +223,9 @@ export default {
 }
 
 .stepsBtn {
+  display: flex;
   margin: 20px auto;
+  justify-content: center;
 }
-.stepsBtn {
-  width: 64%;
-  text-align: center;
-  margin-top: 50px;
-}
+
 </style>

src/pages/Groupmeal/Distrib/index.less

@@ -3,7 +3,8 @@
 	height: 100%;
 	padding: 0 30px;
     .header {
-        text-align: right;
+        display: flex;
+        justify-content: flex-end;
         margin-bottom: 30px;
     }
     .dioFor {

src/pages/Groupmeal/Distrib/index.vue

@@ -32,7 +32,7 @@
             {{ scope.row.list.map((item) => item.deliverer_name).join("、") }}
           </template>
         </el-table-column>
-        <el-table-column prop="prop" label="操作" width="width" align="center">
+        <el-table-column label="操作" fixed="right">
           <template #default="scope">
             <el-button type="primary" @click="handleModify(scope.row)"
               >修改</el-button

vue.config.js

@@ -52,6 +52,15 @@ module.exports = {
   lintOnSave: false,
   configureWebpack: {
     devServer: {
+      proxy: {
+        '/api': {
+          target: `http://bp-test.ini.yidian-inc.com/ksy/ks3apiunencrypt/ks3api_upload`,
+          changeOrigin: true,
+          pathRewrite: {
+            '^/api': ''
+          }
+        },
+      },
       proxy: "http://127.0.0.1:8055", //http://localhost:8055
       hot: true,
       disableHostCheck: true,
@@ -59,7 +68,7 @@ module.exports = {
     resolve: {
       // 配置解析规则
       alias: {
-          '@': path.join(__dirname, 'src') // 使用@别名简写src目录所在的绝对路径
+        '@': path.join(__dirname, 'src') // 使用@别名简写src目录所在的绝对路径
       },
     },
     externals: externalObj,