Merge branch 'feature/activity' into test

# Conflicts:
#	package-lock.json
#	server/config.js
#	server/router.js
#	src/pages/Groupmeal/Distrib/index.vue
#	src/router/index.js

package-lock.json

@@ -11,6 +11,7 @@
       "dependencies": {
         "axios": "^0.21.1",
         "core-js": "^3.6.5",
+        "dayjs": "^1.10.6",
         "element-plus": "^1.0.2-beta.44",
         "form-data": "^4.0.0",
         "json-bigint": "^1.0.0",
@@ -2866,13 +2867,9 @@
       "resolved": "https://registry.nlark.com/@vue/cli-plugin-vuex/download/@vue/cli-plugin-vuex-4.5.13.tgz",
       "integrity": "sha1-mGRti8HmnPbGpsui/tPqzgNWw2A=",
       "dev": true,
-<<<<<<< HEAD
       "peerDependencies": {
         "@vue/cli-service": "^3.0.0 || ^4.0.0-0"
       }
-=======
-      "requires": {}
->>>>>>> feature/activity
     },
     "node_modules/@vue/cli-service": {
       "version": "4.5.13",
@@ -3408,7 +3405,6 @@
       "resolved": "https://registry.npm.taobao.org/@vue/preload-webpack-plugin/download/@vue/preload-webpack-plugin-1.1.2.tgz?cache=0&sync_timestamp=1613215133431&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40vue%2Fpreload-webpack-plugin%2Fdownload%2F%40vue%2Fpreload-webpack-plugin-1.1.2.tgz",
       "integrity": "sha1-zrkktOyzucQ4ccekKaAvhCPmIas=",
       "dev": true,
-<<<<<<< HEAD
       "engines": {
         "node": ">=6.0.0"
       },
@@ -3416,9 +3412,6 @@
         "html-webpack-plugin": ">=2.26.0",
         "webpack": ">=4.0.0"
       }
-=======
-      "requires": {}
->>>>>>> feature/activity
     },
     "node_modules/@vue/reactivity": {
       "version": "3.0.11",
@@ -3457,13 +3450,9 @@
       "resolved": "https://registry.nlark.com/@vue/test-utils/download/@vue/test-utils-2.0.0-rc.6.tgz",
       "integrity": "sha1-0KrCTSBFDTeeGD9wVCwIImcLh4M=",
       "dev": true,
-<<<<<<< HEAD
       "peerDependencies": {
         "vue": "^3.0.1"
       }
-=======
-      "requires": {}
->>>>>>> feature/activity
     },
     "node_modules/@vue/web-component-wrapper": {
       "version": "1.3.0",
@@ -3708,13 +3697,9 @@
       "resolved": "https://registry.npm.taobao.org/acorn-jsx/download/acorn-jsx-5.3.1.tgz",
       "integrity": "sha1-/IZh4Rt6wVOcR9v+oucrOvNNJns=",
       "dev": true,
-<<<<<<< HEAD
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
-=======
-      "requires": {}
->>>>>>> feature/activity
     },
     "node_modules/acorn-walk": {
       "version": "6.2.0",
@@ -3766,26 +3751,18 @@
       "resolved": "https://registry.npm.taobao.org/ajv-errors/download/ajv-errors-1.0.1.tgz",
       "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0=",
       "dev": true,
-<<<<<<< HEAD
       "peerDependencies": {
         "ajv": ">=5.0.0"
       }
-=======
-      "requires": {}
->>>>>>> feature/activity
     },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1616882351228&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz",
       "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=",
       "dev": true,
-<<<<<<< HEAD
       "peerDependencies": {
         "ajv": "^6.9.1"
       }
-=======
-      "requires": {}
->>>>>>> feature/activity
     },
     "node_modules/alphanum-sort": {
       "version": "1.0.2",
@@ -7328,6 +7305,7 @@
     },
 <<<<<<< HEAD
     "node_modules/dayjs": {
+<<<<<<< HEAD
       "version": "1.10.5",
       "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdayjs%2Fdownload%2Fdayjs-1.10.5.tgz",
       "integrity": "sha1-VgDfRUj8JFOz8WPrsqu+llzPuYY="
@@ -7336,6 +7314,17 @@
       "version": "1.10.6",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.6.tgz",
       "integrity": "sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw=="
+>>>>>>> feature/activity
+=======
+<<<<<<< HEAD
+      "version": "1.10.6",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.6.tgz",
+      "integrity": "sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw=="
+=======
+      "version": "1.10.5",
+      "resolved": "https://registry.nlark.com/dayjs/download/dayjs-1.10.5.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fdayjs%2Fdownload%2Fdayjs-1.10.5.tgz",
+      "integrity": "sha1-VgDfRUj8JFOz8WPrsqu+llzPuYY="
+>>>>>>> master
 >>>>>>> feature/activity
     },
     "node_modules/deasync": {

server/config.js

@@ -19,7 +19,7 @@ module.exports = {
   API_INTERNAL_URI: API_INTERNAL_URI[env],
   PANDORA_URI: PANDORA_URI[env],
   GOODS_URI: API_INTERNAL_URI[env],
-  WITHDRAWAL_URI: API_INTERNAL_URI[env],
   GROUPMEAL_URI: API_INTERNAL_URI[env],
-  ACTIVITY_URI: API_INTERNAL_URI[env]
+  ACTIVITY_URI: API_INTERNAL_URI[env],
+  WITHDRAWAL_URI: API_INTERNAL_URI[env],
 };

server/router.js

@@ -6,9 +6,9 @@ const enterprise = require("./controllers/enterprise");
 const role = require('./controllers/role')
 const life = require('./controllers/life-no');
 const goods = require('./controllers/goods');
+const activity = require('./controllers/activity');
 const withdrawal = require('./controllers/withdrawal');
 const groupmeal = require('./controllers/groupmeal');
-const activity = require('./controllers/activity');
 
 const router = Router();
 const API_VERSION = "/api/v1";
@@ -52,7 +52,6 @@ router.post(`${API_VERSION}/goods/background/audit_reject`, goods.auditReject);
 router.get(`${API_VERSION}/shop/background/shop_list`, goods.getShopsList);
 router.post(`${API_VERSION}/shop/background/add_shop`, goods.addShop);
 router.post(`${API_VERSION}/goods/background/edit_goods`, goods.editGoods)
-router.get(`${API_VERSION}/get_goods_category_list`, goods.getCategoryList)
 // 营销活动
 router.post(`${API_VERSION}/get_marketing_list`, goods.getMarketingList)
 router.post(`${API_VERSION}/get_addmarketing_list`, goods.getAddMarketingList)
@@ -64,6 +63,7 @@ router.post(`${API_VERSION}/merchant/lifeinner/life_info`, life.get_life_info)
 router.get(`${API_VERSION}/merchant/lifeinner/life_list`, life.get_life_list)
 //用户
 router.post(`${API_VERSION}/merchant/authority/get_user_info`, user.getUser_detail)
+
 // 团餐运营--配送
 router.post(`${API_VERSION}/order/deliverer/list_day_deliverer_conf`, groupmeal.getList)
 router.post(`${API_VERSION}/order/deliverer/list_day_deliverer`, groupmeal.getDelivererList)

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

@@ -408,7 +408,6 @@ export default {
       this.addCommodityPopup = true;
       this.commodityForm = {};
       if (type == "add") {
-        console.log(this.editInfo);
         this.commodityForm.total_amount_order = 0;
         this.addCommodityTitle = "商品添加";
       } else {
@@ -484,8 +483,26 @@ export default {
 
     // 商品库选择商品保存
     comLibrarySave() {
+      if (this.multipleSelection.length == 0) {
+        ElMessage.error("请选择商品");
+        return;
+      }
       this.selCommodityPopup = false;
-      this.comTableData.push(...this.multipleSelection);
+      if (this.comTableData.length == 0) {
+        this.comTableData.push(...this.multipleSelection);
+      } else {
+        for (var i in this.comTableData) {
+          for(var j in this.multipleSelection)
+          if (
+            this.comTableData[i].goods_sku_id !=
+            this.multipleSelection[j].goods_sku_id
+          ) {
+            continue;
+          } else {
+            this.comTableData.push(this.multipleSelection[j]);
+          }
+        }
+      }
     },
 
     // 移除

src/pages/Goods/Detail/index.less

 .detail {
-	height: 100%;
+	// height: 100%;
 	.state {
 		display: flex;
 		align-items: center;

src/pages/Goods/Detail/index.vue

@@ -1287,9 +1287,9 @@ export default {
       if (query.price == 0) {
         return this.$message.error("售价价格不得为0");
       }
-      if (query.original_price && typeof query.original_price !== "number") {
-        return this.$message.error("原价价格必须为数字");
-      }
+      // if (query.original_price && typeof query.original_price !== "number") {
+      //   return this.$message.error("原价价格必须为数字");
+      // }
       if (typeof query.price !== "number") {
         return this.$message.error("售价价格必须为数字格式");
       }

src/pages/Goods/Retail/index.vue

@@ -205,7 +205,7 @@
               label="金额计算方式:"
             >
               <el-radio-group
-                v-model="countType"
+                v-model="ruleForm.commission_mode"
               >
                 <el-radio :label="2">按金额</el-radio>
                 <el-radio :label="1">按比例</el-radio>
@@ -218,7 +218,7 @@
                 @input="changeValue($event, 'first_commission_value')"
                 :disabled="shopStart !== 0"
               >
-                <template #append>{{countType == 1? '%' : '￥'}}</template>
+                <template #append>{{ruleForm.commission_mode == 1? '%' : '￥'}}</template>
               </el-input>
             </el-form-item>
             <el-form-item label="分享者佣金: " prop="second_commission_value">
@@ -228,7 +228,7 @@
                 @input="changeValue($event, 'second_commission_value')"
                 :disabled="shopStart !== 0"
               >
-                <template #append>{{countType == 1? '%' : '￥'}}</template>
+                <template #append>{{ruleForm.commission_mode == 1? '%' : '￥'}}</template>
               </el-input>
             </el-form-item>
             <el-form-item label="活动生效时间:">
@@ -369,7 +369,7 @@ export default {
   data() {
     var commission = (rule, value, callback) => {
       if (
-        this.countType == 1 &&
+        this.ruleForm.commission_mode == 1 &&
         (this.ruleForm.first_commission_value +
           this.ruleForm.second_commission_value >
           50 ||
@@ -410,6 +410,7 @@ export default {
 
       ruleForm: {
         marketing_name: "",
+        commission_mode: 1,
         first_commission_value: "",
         second_commission_value: "",
         start_time: "",
@@ -450,7 +451,6 @@ export default {
       marketing_id: "",
       marketing_info: {},
       disabled: false,
-      countType: 2
     };
   },
   methods: {
@@ -619,6 +619,7 @@ export default {
           let {
             marketing_name,
             first_commission_value,
+            commission_mode,
             second_commission_value,
           } = this.ruleForm;
           let [start_time, end_time] = this.timeSelect || [];
@@ -633,6 +634,7 @@ export default {
           }
           let addParams = {
             goods_sku_id,
+            commission_mode,
             marketing_name,
             first_commission_value: first_commission_value + "",
             second_commission_value: second_commission_value + "",

src/pages/Groupmeal/Distrib/index.vue

@@ -342,7 +342,7 @@ export default {
       this.selectActivity = code;
       console.log(code);
       try {
-        const res = await getDelivererList({ code});
+        const res = await getDelivererList({ code });
         this.deliverer = res.response;
         this.isEdit = true;
         this.getList();

src/router/index.js

@@ -98,12 +98,12 @@ const routes = [
   },
   // 商品管理路由
   ...goodsRouter,
+  // 活动管理路由
+  ...activityRouters,
   // 钱包审核
   ...withdrawalRoutes,
   // 团餐运营
-  ...groupmealRouters,
-  // 活动管理路由
-  ...activityRouters
+  ...groupmealRouters
 ];
 console.log(routes);