diff --git a/src/components/class/userList.vue b/src/components/class/userList.vue index c853551c81c4ab4e8ea999ed1ba2b62d44567688..cfc4ea32ce4fca8b294786e32dd5c0a9c2adcbc1 100644 --- a/src/components/class/userList.vue +++ b/src/components/class/userList.vue @@ -52,7 +52,7 @@ <el-button type="primary" @click="searchList">æœç´¢</el-button> <el-button type="success" @click="changeClass" v-if="!$store.state.readonly">切æ¢ç级</el-button> <el-button type="success" @click="onAddUser(false)" v-if="!$store.state.readonly">+æ·»åŠ ç”¨æˆ·</el-button> - <el-button type="primary" @click="exportTable">导出</el-button> + <el-button type="primary" @click="exportTable(userTable)">导出</el-button> </el-form-item> </el-form> <el-table @@ -897,8 +897,9 @@ }); }); }, - exportTable(){ - let json = {}; + exportTable(data){ + if(data.length>0){ + let json = {}; if (this.searchFrom.user_id) { json.user_id = this.searchFrom.user_id } @@ -913,6 +914,8 @@ json.pay_end_at =this.timeLang[1] } exportExcelApi(`api/admin/class/user/export/${this.userObj.classId}`,json); + } + }, }, diff --git a/src/components/notBuyClass/entrance.vue b/src/components/notBuyClass/entrance.vue index d9a73ef81a1e93a05fbfbf538513bab4e8dfcd79..4549c521f8b8df4a743c0d2bb4826e2fe0b01604 100644 --- a/src/components/notBuyClass/entrance.vue +++ b/src/components/notBuyClass/entrance.vue @@ -19,7 +19,7 @@ <el-form-item> <div class="search-btn-block"> <el-button type="primary" plain @click="getUser(searchFrom)">确定</el-button> - <el-button type="primary" plain @click="getLink1()">å¤åˆ¶é“¾æŽ¥</el-button> + <el-button type="primary" plain @click="copyUrl(link1)">å¤åˆ¶é“¾æŽ¥</el-button> </div> </el-form-item> </el-form> @@ -40,7 +40,7 @@ <el-form-item> <div class="search-btn-block"> <el-button type="primary" plain @click="getUser(searchFrom2)">确定</el-button> - <el-button type="primary" plain @click="getLink2()">å¤åˆ¶é“¾æŽ¥</el-button> + <el-button type="primary" plain @click="copyUrl(link2)">å¤åˆ¶é“¾æŽ¥</el-button> </div> </el-form-item> </el-form> @@ -64,15 +64,17 @@ activeName: 'first', searchFrom:{ key:'goods_receive_course ', - desc: '', + desc: '商å“', value: '', }, searchFrom2:{ key:'periods_receive_course', - desc: '', + desc: '期数', value: '', }, selectedGoods:[], + link1:"", + link2:"", } }, mounted(){ @@ -86,10 +88,8 @@ initPage(){ getConfigListApi({key:this.searchFrom.key}).then(res=>{ if(res.list && res.list.length>0){ - this.searchFrom.desc = res.list[0].desc; this.searchFrom.value = res.list[0].value; }else{ - this.searchFrom.desc = ''; this.searchFrom.value = ''; } }); @@ -99,23 +99,12 @@ // this.selectedGoods = [parseInt(res.goods_id),parseInt(res.list[0].value)]; // console.log(res.list) }else{ - this.searchFrom2.desc = ''; this.searchFrom2.value = ''; } - this.searchFrom2.desc = ''; this.searchFrom2.value = ''; - }) - }, - getPeriodsList(){ - let json1={ - limit: 2000, - page: 1 - } - getPeriodsApi(json1).then(res=>{ - console.log(res.list) - - this.periodsList = res.list; }); + this.linkContent1(); + this.linkContent2(); }, getGoodsList(){ let json = { @@ -134,12 +123,11 @@ cancelButtonText: 'å–æ¶ˆ', type: 'warning' }).then(() => { - console.log(data); let json ={ + value:data.value, + desc:data.desc, + key:data.key } - json.value=data.value; - json.key=data.key; - json.desc="2"; putConfigApi(json).then(res=>{ this.$message({ type: 'success', @@ -166,7 +154,7 @@ }) }, - initPage1(){ + getPeriodsList(){ let json = { page: 1, limit: 100, @@ -179,44 +167,42 @@ this.periodsList = res.list; }); }, - getLink1(){ - let json={ + copyUrl(data){ + let url = data; + let oInput = document.createElement('input'); + oInput.value = url; + document.body.appendChild(oInput); + oInput.select(); // 选择对象; + document.execCommand("Copy"); // 执行æµè§ˆå™¨å¤åˆ¶å‘½ä»¤ + this.$message({ + message: 'å·²æˆåŠŸå¤åˆ¶åˆ°å‰ªåˆ‡æ¿', + type: 'success' + }); + oInput.remove() + }, + linkContent1(){ + let json={ } json.url="https://wechat.changchangenglish.com/api/client/login?goods_id=1%26redirect_url=https://wechat.changchangenglish.com" - getLinkApi(json).then(res => { - this.copyUrl(res.url); + this.link1=res.url; }); }, - getLink2(){ - let json={ + linkContent2(){ + let json={ } json.url="https://wechat.changchangenglish.com/api/client/login?goods_id=1%26redirect_url=https://wechat.changchangenglish.com" getLinkApi(json).then(res => { - this.copyUrl(res.url); + this.link2=res.url; }); - }, - copyUrl(data) { - let url = data; - let oInput = document.createElement("input"); - oInput.value = url; - document.body.appendChild(oInput); - oInput.select(); // 选择对象 - document.execCommand("Copy"); // 执行æµè§ˆå™¨å¤åˆ¶å‘½ä»¤ - this.$message({ - message: "å·²æˆåŠŸå¤åˆ¶åˆ°å‰ªåˆ‡æ¿", - type: "success" - }); - oInput.remove(); - } + } }, watch:{ 'entranceObj.show':function(a){ if(a){ - this.initPage1(); - this.initPage() this.getPeriodsList(); + this.initPage() this.getGoodsList(); } } diff --git a/src/components/yunji/index.vue b/src/components/yunji/index.vue index 9dc0bedf3d42ca567aa36400aefda232af95fbf5..3f228de592502742323854e6c3dd43d3efe19b3c 100644 --- a/src/components/yunji/index.vue +++ b/src/components/yunji/index.vue @@ -59,7 +59,7 @@ <img class="avatar" :src="scope.row.avatar"/> {{scope.row.nickname}}<br>(ID:{{scope.row.user_id}}) </div> <div v-else> - 用户暂未够课 + 用户暂未è´è¯¾ </div> </template> </el-table-column> @@ -140,8 +140,10 @@ let msg = ''; if(value === 40){ msg = 'å¾…å‘è´§' - }else{ + }else if(value==50){ msg = 'å·²å‘è´§' + }else{ + msg= "" } return msg; },