ss

src/components/class/index.vue

@@ -26,6 +26,9 @@
           <el-button type="primary" @click="getClassList">
             搜索
           </el-button>
+          <el-button type="success" @click="sendMsg">
+            发送活动通知
+          </el-button>
         </el-form-item>
         <el-form-item style="float: right">
           <el-button @click="onAdd" type="success" v-if="!$store.state.readonly">+添加班级</el-button>
@@ -254,6 +257,28 @@
       this.initPage();
     },
     methods:{
+      sendMsg(){
+        if(this.title&&this.title.title){
+          this.$confirm("你将发送给" + this.title.title + "用户", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(()=>{
+            // console.log(this.selectedGoods)
+            postActiveNoticeApi(this.periods.id).then(res=>{
+              this.noticeDialog=false;
+              this.$message({
+                type: "success",
+                message: "发送成功"+res.num+'个'
+              });
+            })
+          })
+        }else{
+          this.$message({
+            message: "请选择期数"
+          });
+        }
+      },
       changeRow(data,b){
         if(b.indexOf(data)>-1){
           getClassStatisticsApi(data.periods_id,data.id).then(res=>{

src/components/config/index.vue

@@ -191,7 +191,7 @@
         </el-table>
        </div>
       </el-collapse-item>
-      <el-collapse-item title="全勤活动星星期数"  name="10">
+      <el-collapse-item title="全勤活动星星期数(赠绘本)"  name="10">
         <div>
           <el-button  @click="periodDialogFn(1)">
             添加期数
@@ -228,9 +228,46 @@
         </el-table>
        </div>
       </el-collapse-item>
+      <el-collapse-item title="全勤活动星星期数(返奖学金)"  name="11">
+      <div>
+          <el-button  @click="periodDialogFn(2)">
+            添加期数
+          </el-button>
+        <el-table
+          :data="starV2List"
+          style="width: 100%">
+          <el-table-column
+            prop="id"
+            label="id" width="100">
+          </el-table-column>
+          <el-table-column
+            prop="goods_name"
+            label="商品名称">
+          </el-table-column>
+          <el-table-column
+            prop="title"
+            label="标题">
+          </el-table-column>
+          <el-table-column
+            label="操作"
+            min-width="150"
+            v-if="!$store.state.readonly">
+            <template slot-scope="scope">
+              <el-button
+                @click="delStarV2ListFn(scope.row)"
+                type="warning"
+                plain
+                size="mini">
+                删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+       </div>
+      </el-collapse-item>
      </el-collapse>
      </div>
-     <div class="item">
+     <!-- <div class="item">
        <div style="margin-top:30px;">
         系统功能
        </div>
@@ -241,13 +278,11 @@
         </el-button>
        </div>
        <div style="margin-top:20px;"></div>
-       
-     </div>
+     </div> -->
     </div>
     <el-dialog
       title="发生活动通知(限活动期数发送)"
-      :visible.sync="noticeDialog"
-      >
+      :visible.sync="noticeDialog">
         <el-cascader
                 :options="periodList"
                 :props="{value:'id',label:'name'}"
@@ -262,8 +297,7 @@
     </el-dialog>
     <el-dialog
       title="添加期数"
-      :visible.sync="periodDialog"
-      >
+      :visible.sync="periodDialog">
         <el-cascader
                 :options="periodList"
                 :props="{value:'id',label:'name'}"
@@ -293,7 +327,10 @@ import {
   getStarActivityPeriodApi,
   getYunjiActivityPeriodApi,
   delYunjiActivityPeriodApi,
-  delStarActivityPeriodApi
+  delStarActivityPeriodApi,
+  delStarActivityV2PeriodApi,
+  addStarActivityV2PeriodApi,
+  getStarActivityV2PeriodApi
 } from "../../service/api";
 import {GOODSTYPE,CLASSSOURCE} from '../../util/wordbook';
 export default {
@@ -301,6 +338,7 @@ export default {
   props: ["entranceObj"],
   data() {
     return {
+      starListV2:[],
       noticeDialog:false,
       periodDialog:false,
       activeName: "1",
@@ -343,7 +381,8 @@ export default {
       periodsId:'',
       periodsType:'',
       yunjiList:[],
-      starList:[]
+      starList:[],
+      starV2List:[]
     };
   },
   mounted() {
@@ -354,29 +393,52 @@ export default {
   methods: {
     delYunjiListFn(row){
       console.log(row)
-       this.$confirm('确认关闭？')
+       this.$confirm('确认删除？')
           .then(_ => {
             delYunjiActivityPeriodApi(row.id).then(res =>{
                getYunjiActivityPeriodApi().then(res =>{
                 this.yunjiList = res
+                this.$message({
+                  type: "success",
+                  message: "删除成功"
+                });
               })
             })
-          })
-          .catch(_ => {});
+          }).catch(_ => {});
     },
     delStarListFn(row){
       console.log(row)
-       this.$confirm('确认关闭？')
+       this.$confirm('确认删除？')
           .then(_ => {
             delStarActivityPeriodApi(row.id).then(res =>{
                getStarActivityPeriodApi().then(res =>{
                 this.starList = res
+                this.$message({
+                  type: "success",
+                  message: "删除成功"
+                });
+              })
+            })
+          }).catch(_ => {});
+    },
+    delStarV2ListFn(row){
+      console.log(row)
+       this.$confirm('确认删除？')
+          .then(_ => {
+            delStarActivityV2PeriodApi(row.id).then(res =>{
+               getStarActivityV2PeriodApi().then(res =>{
+                this.starV2List = res
+                this.$message({
+                  type: "success",
+                  message: "删除成功"
+                });
               })
             })
           })
           .catch(_ => {});
     },
     addPeriod(){
+      console.log(this.periods)
       if(this.periodsType==0){
         addyunjiPeriodApi(this.secGoods[1]).then(res =>{
           this.$message({
@@ -388,7 +450,7 @@ export default {
           this.yunjiList = res
         })
         })
-      }else{
+      }else if(this.periodsType==1){
         addStarActivityPeriodApi(this.secGoods[1]).then(res =>{
           this.$message({
             type: "success",
@@ -399,7 +461,18 @@ export default {
           this.starList = res
           // console.log(this.yunjiList)
         })
-          
+        })
+      }else{
+        addStarActivityV2PeriodApi(this.secGoods[1]).then(res =>{
+          this.$message({
+            type: "success",
+            message: "数据插入成功"
+          });
+          this.periodDialog=false;
+          getStarActivityV2PeriodApi().then(res =>{
+          this.starV2List = res
+          // console.log(this.yunjiList)
+         })
         })
       }
     },
@@ -410,7 +483,7 @@ export default {
         })
       },
     onSend(){
-        console.log(this.secGoods)
+        // console.log(this.secGoods)
         postActiveNoticeApi(this.secGoods[1]).then(res=>{
           this.noticeDialog=false;
           this.$message({
@@ -558,6 +631,10 @@ export default {
         getStarActivityPeriodApi().then(res =>{
           this.starList= res
         })
+      }else if(val ==='11'){
+        getStarActivityV2PeriodApi().then(res =>{
+          this.starV2List= res
+        })
       }
     },
     first() {

src/service/api.js

@@ -1146,6 +1146,18 @@ export const getStarActivityPeriodApi = function () {
 export const getYunjiActivityPeriodApi = function () {
     return Vue.prototype.$fetch(`api/admin/sys/yunji/periods`)
 };
+//云集活动期数列表
+export const getStarActivityV2PeriodApi = function () {
+    return Vue.prototype.$fetch(`api/admin/star/bonus/periods`)
+};
+//添加星星活动期数
+export const addStarActivityV2PeriodApi = function (periods_id) {
+    return Vue.prototype.$post(`/api/admin/star/bonus/periods/${periods_id}`)
+};
+//删除星星活动期数
+export const delStarActivityV2PeriodApi = function (periods_id) {
+    return Vue.prototype.$del(`/api/admin/star/bonus/periods/${periods_id}`)
+};
 //待发货列表
 export const getDeliverListApi = function (json) {
     return Vue.prototype.$fetch(`api/admin/order/deliver/list`,json)

src/service/index.js

@@ -31,7 +31,7 @@ axios.interceptors.request.use(
     if(config.method === 'get' && config.url !== '/api/admin/login'){
       config.params = config.params || {};
       let json = JSON.parse(JSON.stringify(config.params));
-      console.log(json)
+      // console.log(json)
       for(let k in json)
       {
         // let reg = /^[0-9]+$/u;
@@ -55,7 +55,7 @@ axios.interceptors.request.use(
       if(process.env.NODE_ENV === 'development' ){
         config.params.special_token="changchangenglish";
       }
-      console.log(JSON.stringify(json))
+      // console.log(JSON.stringify(json))
       config.params.param_token = md5(JSON.stringify(json));
     }else if(config.url !== '/api/admin/login'){
       config.data = config.data || {};