| plugins/exchange/forms/mall/CodeEditForm.php | ●●●●● patch | view | raw | blame | history | |
| plugins/exchange/forms/mall/CodeForm.php | ●●●●● patch | view | raw | blame | history | |
| plugins/exchange/views/code/index.php | ●●●●● patch | view | raw | blame | history | |
| plugins/exchange/views/library/edit.php | ●●●●● patch | view | raw | blame | history |
plugins/exchange/forms/mall/CodeEditForm.php
@@ -135,7 +135,7 @@ 'library_id' => $this->library_id, 'type' => 0, 'code' => $newItem['key2'], 'status' => 1, 'status' => $newItem['key5'], 'validity_type' => 'all', 'valid_end_time' => $newItem['key4'], 'valid_start_time' => $newItem['key3'], plugins/exchange/forms/mall/CodeForm.php
@@ -153,7 +153,9 @@ $item['status'] = (new CommonModel())->getStatus($library, $item); if (in_array($item['status'], [2, 3])) { $u = User::findOne($item['r_user_id']); $item['r_rewards'] = (new CommonModel())->getFormatRewards($item['r_rewards']); if(isset($item['r_rewards'])){ $item['r_rewards'] = (new CommonModel())->getFormatRewards($item['r_rewards']); } $item['nickname'] = $u->nickname; $item['avatar'] = $u->userInfo->avatar; $item['platform'] = PlatformConfig::getInstance()->getPlatform($u); plugins/exchange/views/code/index.php
@@ -129,7 +129,7 @@ <div flex="wrap:wrap cross:center" style="margin-bottom: 15px;"> <div>密码</div> <div class="input-item" style="width: 230px"> <el-input maxlength="12" @keyup.enter.native="toSearch" size="small" placeholder="请输入提货卡" v-model="keyword" clearable @clear="toSearch"> <el-input maxlength="12" @keyup.enter.native="toSearch" size="small" placeholder="请输入密码" v-model="keyword" clearable @clear="toSearch"> <el-button slot="append" icon="el-icon-search" @click="toSearch"></el-button> </el-input> </div> @@ -475,7 +475,8 @@ keyword: that.form.mobile, }, }).then(e => { if (e.data.code == 0) { if (e.data.code == 0) { that.form.user = {}; this.user.list = e.data.data.list; for(let item of e.data.data.list) { that.form.user = item; @@ -498,6 +499,13 @@ }, }).then(e => { if (e.data.code == 0) { that.provinceName = ''; that.getCity(); that.cityName = ''; that.getDistrict(); that.districtName = ''; that.address_detail = ''; that.form.name = ''; for(let item of e.data.data.list) { let add = item.address; let first = add.indexOf(' '); plugins/exchange/views/library/edit.php
@@ -641,9 +641,11 @@ </app-new-export-dialog> --> </div> <!-- <div flex="cross:center" class="download"> <el-button @click="allDownload" size="mini">下载二维码</el-button> </div> --> <el-table class="table-info" :data="list" border style="width: 100%" v-loading="listLoading && !exchangeVisible" @selection-change="codeChange"> <el-table-column type="selection" width="55"></el-table-column> <el-table-column prop="card_no" label="卡号" width="220"></el-table-column> @@ -676,21 +678,24 @@ </el-table-column> <el-table-column label="操作"> <template slot-scope="scope"> <!-- <el-button class="copy-btn" circle size="mini" type="text" data-clipboard-action="copy" :data-clipboard-target="'#a' + scope.row.code"> <el-tooltip effect="dark" content="复制" placement="top"> <img src="statics/img/plugins/copy.png" alt=""> </el-tooltip> </el-button> --> <el-button @click="ban(scope.row)" v-if="scope.row.status == 1" circle size="mini" type="text"> <el-tooltip effect="dark" content="禁用" placement="top"> <img src="statics/img/mall/order/cancel.png" alt=""> </el-tooltip> </el-button> <el-button @click="lookDetail(scope.row)" v-if="scope.row.status == 2" circle size="mini" type="text"> <el-button @click="lookDetail(scope.row)" v-if="scope.row.status == 2 && scope.row.r_rewards" circle size="mini" type="text"> <el-tooltip effect="dark" content="兑换详情" placement="top"> <img src="statics/img/mall/detail.png" alt=""> </el-tooltip> </el-button> <!-- <el-button @click="openQr(scope.row)" v-if="scope.row.status == 1 || scope.row.status == 0" circle size="mini" type="text"> <el-tooltip effect="dark" content="查看二维码" placement="top"> <img src="statics/img/plugins/look.png" alt=""> @@ -701,6 +706,7 @@ <img src="statics/img/plugins/download.png" alt=""> </el-tooltip> </el-button> --> </template> </el-table-column> </el-table>
