修复营销活动

src/api/tools/alipay.js

@@ -2,14 +2,14 @@ import request from '@/utils/request'
 
 export function get() {
   return request({
-    url: 'api/aliPay',
+    url: 'bxg/api/aliPay',
     method: 'get'
   })
 }
 
 export function update(data) {
   return request({
-    url: 'api/aliPay',
+    url: 'bxg/api/aliPay',
     data,
     method: 'put'
   })
@@ -18,7 +18,7 @@ export function update(data) {
 // 支付
 export function toAliPay(url, data) {
   return request({
-    url: 'api/' + url,
+    url: 'bxg/api/' + url,
     data,
     method: 'post'
   })

src/views/bxg/activity/bargain/form.vue

@@ -244,6 +244,11 @@ export default {
     },
     doAdd() {
       add(this.form).then(res => {
+        if (res.status==500){
+          this.loading = false
+          this.$message.error(res.msg)
+          return
+        }
         this.resetForm()
         this.$notify({
           title: '添加成功',

src/views/bxg/activity/combination/form.vue

@@ -155,13 +155,12 @@
                     <el-input type="text" v-model="scope.row.stock" maxlength="7" :disabled="true"/>
                   </template>
                 </el-table-column>
-
+                <el-table-column prop="pink_price" label="拼团价" align="center">
-                <el-table-column prop="stock" label="拼团价" align="center">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.pink_price"/>
                   </template>
                 </el-table-column>
-                <el-table-column prop="stock" label="拼团库存" align="center">
+                <el-table-column prop="pink_stock" label="拼团库存" align="center">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.pink_stock" maxlength="7"/>
                   </template>
@@ -228,6 +227,12 @@ export default {
   components: {editor, picUpload, mulpicUpload, Treeselect, MaterialList, UeditorWrap, singlePic, cgood},
   data() {
     return {
+      rule:{
+        phone: [
+          { required: true, message: '请输入手机号码', trigger: 'blur' },
+          { pattern: /^((1[3,5,8][0-9])|(14[5,7])|(17[0,5,6,7,8])|(19[7]))\d{8}$/, message: '请检查手机号是否正确', trigger: 'blur' },
+        ],
+      },
       spinShow: false,
       // 批量设置表格data
       oneFormBatch: [
@@ -356,6 +361,8 @@ export default {
       loading: false,
       treeSelect: [],
       tableIndex: 0,
+
+
       ruleValidate: {
         title: [
           {required: true, message: '请输入拼团名称', trigger: 'blur'}
@@ -379,8 +386,14 @@ export default {
           {required: true, message: '请选择运费模板', trigger: 'change', type: 'number'}
         ],
         price: [
-          {required: true, message: '请输入拼团价格', trigger: 'blur'}
+          {required: true, message: '请输入商品售价', trigger: 'blur'}
         ],
+        // pink_price: [
+        //   {required: true, message: '请输入拼团价格', trigger: 'blur'}
+        // ],
+        // pink_stock: [
+        //   {required: true,message: '库存设置不能小于0', trigger: 'blur',min: 1, },
+        // ],
         people: [
           {required: true, message: '请选择拼团人数', trigger: 'change', type: 'number'}
         ],
@@ -651,6 +664,7 @@ export default {
         if (valid) {
           if (this.formValidate.spec_type === 0) {
             this.formValidate.attrs = this.oneFormValidate;
+            console.log('this.oneFormValidate',this.oneFormValidate)
             this.formValidate.header = [];
             this.formValidate.items = [];
           } else {
@@ -661,12 +675,16 @@ export default {
             return this.$message.warning('请点击生成规格！');
           }
           add(this.formValidate).then(async res => {
+            if (res.status==500){
+              this.$message.error(res.msg);
+              return
+            }
             this.$message({
               message: '操作成功',
               type: 'success'
             });
             setTimeout(() => {
-              this.$router.push({path: '/activity/combination'});
+              this.$router.push({path: '/bxg/activity/combination'});
             }, 500);
           }).catch(res => {
             this.$message.error(res.msg);

src/views/bxg/activity/combination/index.vue

@@ -122,10 +122,10 @@ export default {
   },
   methods: {
     toAddURL(){
-      this.$router.push({ path: 'bxg/activity/combinationAdd' })
+      this.$router.push({ path: '/bxg/activity/combinationAdd'})
     },
     toUpdateURL(id){
-      this.$router.push({ path: 'bxg/activity/combinationEdit/'+id })
+      this.$router.push({ path: '/bxg/activity/combinationEdit/'+id })
     },
     formatTimeTwo,
     checkPermission,

src/views/bxg/activity/seckill/form.vue

@@ -408,7 +408,7 @@ export default {
   },
   mounted () {
     this.getInfo(),
-    initData('api/yxSystemGroupData',{ groupName: 'yshop_seckill_time',status:1 }).then(res => {
+    initData('bxg/api/yxSystemGroupData',{ groupName: 'yshop_seckill_time',status:1 }).then(res => {
       this.myTimes = res.content
     })
     if(this.$route.params.id){
@@ -660,24 +660,30 @@ export default {
           if(this.formValidate.spec_type === 1 && this.manyFormValidate.length===0){
             return this.$message.warning('请点击生成规格！');
           }
-
-
           // 判断是否是添加
           if(this.isAdd){
             console.log(this.formValidate)
             add(this.formValidate).then(res=>{
+              if (res.status==500){
+                this.$message.error(res.msg);
+                return
+              }
               this.$message({
                 message:'操作成功',
                 type: 'success'
               });
               setTimeout(() => {
-                this.$router.push({ path: '/activity/seckill' });
+                this.$router.push({ path: '/bxg/activity/seckill' });
               }, 500);
             }).catch(res => {
               this.$message.error(res.msg);
             })
           }else{
             add(this.formValidate).then(async res => {
+              if (res.status==500){
+                this.$message.error(res.msg);
+                return
+              }
               this.$message({
                 message:'操作成功',
                 type: 'success'

src/views/bxg/activity/seckill/index.vue

@@ -106,10 +106,10 @@ export default {
   },
   methods: {
     toAddURL(){
-      this.$router.push({ path: '/activity/secKillAdd' })
+      this.$router.push({ path: '/bxg/activity/secKillAdd' })
     },
     toUpdateURL(id){
-      this.$router.push({ path: '/activity/secKillEdit/'+id })
+      this.$router.push({ path: '/bxg/activity/secKillEdit/'+id })
     },
     formatTimeTwo,
     checkPermission,

src/views/bxg/shop/set/seckill.vue

@@ -19,7 +19,12 @@
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="id" label="ID" />
-      <el-table-column prop="map.time" label="开启时间(整数小时)" />
+            <el-table-column prop="map.time" label="开启时间">
+              <template slot-scope="scope">
+                {{scope.row.map.time>9?scope.row.map.time+':00':'0'+scope.row.map.time+':00'}}
+              </template>
+            </el-table-column>
+<!--      <el-table-column prop="map.time" label="开启时间(整数小时)" />-->
       <el-table-column prop="map.continued" label="持续时间(整数小时)" />
       <el-table-column prop="map.status" label="状态">
         <template slot-scope="scope">
@@ -112,7 +117,7 @@ export default {
       _this.form = {
         id: data.id,
         groupName: data.groupName,
-        time: data.map.time,
+        time: data.map.time>9?data.map.time+':00':'0'+data.map.time+':00',
         continued: data.map.continued,
         status:data.map.status
       }

src/views/bxg/shop/set/seckillform.vue

@@ -3,7 +3,16 @@
              :title="isAdd ? '新增' : '编辑'" width="500px">
     <el-form ref="form" :model="form" :rules="rules" size="small" label-width="150px">
       <el-form-item label="开启时间(整数小时)">
-        <el-input v-model="form.time" style="width: 270px;"/>
+<!--        <el-input v-model="form.time" style="width: 270px;"/>-->
+        <el-time-select
+          v-model="form.time"
+          :picker-options="{
+           start: '00:00',
+            step: '00:60',
+             end: '24:00'
+           }"
+          placeholder="选择时间">
+        </el-time-select>
       </el-form-item>
       <el-form-item label="持续时间(整数小时)">
         <el-input v-model="form.continued" style="width: 270px;"/>
@@ -41,7 +50,7 @@ export default {
       form: {
         id: '',
         groupName: 'yshop_seckill_time',
-        time: 5,
+        time: '08:00',
         status:2, //默认关闭
         continued: 2
       },
@@ -62,7 +71,14 @@ export default {
       } else this.doEdit()
     },
     doAdd() {
+      // console.log('this.form',Number(this.form.time.slice(0,2)))
+      this.form.time=Number(this.form.time.slice(0,2))
       add(this.form).then(res => {
+        if (res.status==500){
+          this.$message.error(res.msg)
+          this.loading = false
+          return
+        }
         this.resetForm()
         this.$notify({
           title: '添加成功',
@@ -78,6 +94,11 @@ export default {
     },
     doEdit() {
       edit(this.form).then(res => {
+        if (res.status==500){
+          this.$message.error(res.msg)
+          this.loading = false
+          return
+        }
         this.resetForm()
         this.$notify({
           title: '修改成功',
@@ -97,7 +118,7 @@ export default {
       this.form = {
         id: '',
         groupName: 'yshop_seckill_time',
-        time: 5,
+        time: '08:00',
         continued: 2,
         status:2 //默认关闭
       }

src/views/bxg/shop/userlevel/form.vue

@@ -27,7 +27,10 @@
         <el-radio v-model="form.isShow" :label="1">是</el-radio>
         <el-radio v-model="form.isShow" :label="0" style="width: 200px;">否</el-radio>
       </el-form-item>
-      <el-form-item label="说明">
+      <el-form-item label="权益说明">
+        <el-input v-model="form.benefit" rows="3" type="textarea" />
+      </el-form-item>
+      <el-form-item label="规则说明">
         <el-input v-model="form.explain" rows="3" type="textarea" />
       </el-form-item>
     </el-form>

src/views/bxg/shop/userlevel/index.vue

@@ -138,6 +138,7 @@ export default {
         imageArr: data.image ? data.image.split(',') : [],
         iconArr: data.icon ? data.icon.split(',') : [],
         explain: data.explain,
+        benefit:data.benefit,
         addTime: data.addTime,
         isDel: data.isDel
       }