feat: EK-2936: 会员端Promo和banner图增加分国家设置.

src/lang/en.js

@@ -155,6 +155,7 @@ export default {
     slideshow: 'Slideshow',
     image: 'Image',
     adTitle: 'Ad Title',
+    country: "Country",
     content: 'Content',
     sort: 'Sort',
     modifiedBy: 'Modified By',
@@ -173,6 +174,7 @@ export default {
     upload: 'Upload',
     id: 'ID',
     title: 'Title',
+    country: "Country",
     category: 'Category',
     sort: 'Sort',
     creationTime: 'Creation Time',

src/lang/zh.js

@@ -154,6 +154,7 @@ export default {
     slideshow: '幻灯',
     image: '图片',
     adTitle: '标题',
+    country: "国家",
     content: '内容',
     sort: '排序',
     modifiedBy: '更新人',
@@ -172,6 +173,7 @@ export default {
     upload: '上传',
     id: '序号',
     title: '标题',
+    country: "国家",
     category: '分类',
     sort: '排序',
     creationTime: '创建时间',

src/views/ad/edit.vue

@@ -48,7 +48,7 @@
         <el-form-item>
           <el-button type="primary" :loading="submitButtonStat" @click="onSubmit">{{ $t('common.save') }}</el-button>
         </el-form-item>
-        </el-form-item></el-form>
+      </el-form>
     </div>
   </div>
 </template>
@@ -69,7 +69,8 @@ export default {
         image: '',
         lid: '',
         title: '',
-        type: ''
+        type: '',
+        countryId: '',
       },
       url: '',
       article: '',
@@ -102,6 +103,7 @@ export default {
         this.allArticle = response.data.allArticle
         this.form.image = response.data.oneData.IMAGE
         this.form.content = response.data.oneData.CONTENT
+        this.form.countryId = response.data.oneData.COUNTRY_ID
         this.defaultImageUrl = response.data.oneData.IMAGE
         if (response.data.oneData.TYPE === '1') {
           this.url = response.data.oneData.CONTENT

src/views/ad/list.vue

@@ -11,24 +11,31 @@
         style="width: 100%;"
         @selection-change="handleSelectionChange"
       >
-        <el-table-column type="selection" width="55" />
-        <el-table-column :label="$t('ad.adTitle')" prop="id" align="center" :class-name="getSortClass('id')">
+<!--        <el-table-column type="selection" width="55" />-->
+        <el-table-column :label="$t('ad.country')" prop="id" align="center" :class-name="getSortClass('id')">
           <template slot-scope="{row}">
-            <span>{{ row.TITLE }}</span>
+            <span>{{ row.COUNTRY_NAME }}</span>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('ad.adLocation')" prop="id" align="center" :class-name="getSortClass('id')">
-          <template :value="{allLocation}">
-            <span>{{ allLocation.LOCATION_NAME }}</span>
+        <el-table-column :label="$t('ad.adTitle')" prop="id" align="center" :class-name="getSortClass('id')">
+          <template slot-scope="{row}">
+            <span>{{ row.TITLE }}</span>
           </template>
         </el-table-column>
+<!--        <el-table-column :label="$t('ad.adLocation')" prop="id" align="center" :class-name="getSortClass('id')">-->
+<!--          <template :value="{allLocation}">-->
+<!--            <span>{{ allLocation.LOCATION_NAME }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column :label="$t('ad.type')" align="center"> <!-- 类型 -->
           <template slot-scope="{row}">
-            <template v-if="row.TYPE === '1'">
-              <el-tag type="success">External Links</el-tag> <!-- 外链 -->
-            </template>
-            <template v-else-if="row.TYPE === '2'">
-              <el-tag>Article</el-tag> <!-- 文章 -->
+            <template>
+              <div v-if="row.TYPE === '1'">
+               {{ $t('ad.externalLinks') }}
+              </div><!-- 链接 -->
+              <div v-else-if="row.TYPE === '2'">
+                {{ $t('ad.article') }}
+              </div><!-- 文章 -->
             </template>
           </template>
         </el-table-column>
@@ -53,39 +60,35 @@
             />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('ad.creator')" prop="id" align="center" :class-name="getSortClass('id')">
-          <template slot-scope="{row}">
-            <span>{{ row.CREATE_ADMIN_NAME }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('ad.createTime')" align="center">
-          <template slot-scope="{row}">
-            <span>{{ row.CREATED_AT | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('ad.modifiedBy')" prop="id" align="center" width="80" :class-name="getSortClass('id')">
-          <template slot-scope="{row}">
-            <span>{{ row.UPDATE_ADMIN_NAME }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('ad.modifiedTime')" align="center">
-          <template slot-scope="{row}">
-            <span>{{ tool.formatDate(row.UPDATED_AT) }}</span>
+<!--        <el-table-column :label="$t('ad.creator')" prop="id" align="center" :class-name="getSortClass('id')">-->
+<!--          <template slot-scope="{row}">-->
+<!--            <span>{{ row.CREATE_ADMIN_NAME }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column :label="$t('ad.createTime')" align="center">-->
+<!--          <template slot-scope="{row}">-->
+<!--            <span>{{ row.CREATED_AT | parseTime('{y}-{m}-{d} {h}:{i}') }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column :label="$t('ad.modifiedBy')" prop="id" align="center" width="80" :class-name="getSortClass('id')">-->
+<!--          <template slot-scope="{row}">-->
+<!--            <span>{{ row.UPDATE_ADMIN_NAME }}</span>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+<!--        <el-table-column :label="$t('ad.modifiedTime')" align="center">-->
+<!--          <template slot-scope="{row}">-->
+<!--            <span>{{ tool.formatDate(row.UPDATED_AT) }}</span>-->
 
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('ad.status')" align="center"> <!-- 类型 -->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column :label="$t('article.status')" align="center">
           <template slot-scope="{row}">
-            <template v-if="row.STATUS === '1'">
-              <el-tag type="success">show</el-tag> <!-- 外链 -->
-            </template>
-            <template v-else>
-              <el-tag>hide</el-tag> <!-- 文章 -->
-            </template>
+            <div v-if="row.STATUS.value === '1'">{{$t('article.show')}}</div>
+            <div v-else>{{$t('article.hide')}}</div>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('ad.action')" align="center">
 
+        <el-table-column :label="$t('ad.action')" align="center">
           <template slot-scope="{row}">
             <el-dropdown v-if="permission.hasPermission(`ad/ad-delete`) || permission.hasPermission(`ad/edit`)" size="small" trigger="click">
               <el-button type="primary" size="small" @click.stop="">
@@ -102,16 +105,16 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-dropdown v-if="permission.hasPermission(`ad/ad-delete`)" size="small">
-          <el-button type="primary" size="small">
-            {{ $t('ad.selectData') }}<i class="el-icon-arrow-down el-icon--right" />
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="delete" @click.native="handleMuliDel()">{{ $t('table.delete') }}</el-dropdown-item>
-            <el-dropdown-item command="hide" @click.native="handleMultiHide()">{{ $t('ad.hide') }}</el-dropdown-item>
-            <el-dropdown-item command="un-hide" @click.native="handleMultiUnHide()">{{ $t('ad.unhide') }}</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
+<!--        <el-dropdown v-if="permission.hasPermission(`ad/ad-delete`)" size="small">-->
+<!--          <el-button type="primary" size="small">-->
+<!--            {{ $t('ad.selectData') }}<i class="el-icon-arrow-down el-icon&#45;&#45;right" />-->
+<!--          </el-button>-->
+<!--          <el-dropdown-menu slot="dropdown">-->
+<!--            <el-dropdown-item command="delete" @click.native="handleMuliDel()">{{ $t('table.delete') }}</el-dropdown-item>-->
+<!--            <el-dropdown-item command="hide" @click.native="handleMultiHide()">{{ $t('ad.hide') }}</el-dropdown-item>-->
+<!--            <el-dropdown-item command="un-hide" @click.native="handleMultiUnHide()">{{ $t('ad.unhide') }}</el-dropdown-item>-->
+<!--          </el-dropdown-menu>-->
+<!--        </el-dropdown>-->
         <el-button v-if="permission.hasPermission(`ad/ad-delete`)" type="primary" size="small" icon="el-icon-plus" @click="handleAdd">{{ $t('ad.add') }}</el-button>
         <pagination v-show="total>0" :total="total" @size-change="handleSizeChange" @current-change="handleCurrentChange" :page.sync="listQuery.page" :limit.sync="listQuery.pageSize" @pagination="getList" />
       </div>

src/views/article/edit.vue

@@ -48,7 +48,8 @@ export default {
         title: '',
         cid: null,
         content: '',
-        sort: 1
+        sort: 1,
+        countryId: '',
       },
       content: '',
       allCategory: null,
@@ -64,6 +65,7 @@ export default {
         this.form.cid = response.data.oneData.CID
         this.form.content = response.data.oneData.CONTENT
         this.form.sort = response.data.oneData.SORT
+        this.form.countryId = response.data.oneData.COUNTRY_ID
         this.allCategory = response.data.allCategory
         this.loading = false
         this.isEdit = true

src/views/article/index.vue

@@ -2,14 +2,14 @@
   <div v-loading="loading">
     <div class="white-box">
       <el-table :data="tableData" stripe style="width: 100%;" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" />
-        <el-table-column :label="$t('article.id')" prop="ID">
-          <template slot-scope="scope">
-            <router-link :to="`/article/detail/${scope.row.ID}`" target="_blank" class="islide">
-              <span>{{ scope.row.ID }}</span>
-            </router-link>
-          </template>
-        </el-table-column>
+<!--        <el-table-column type="selection" width="55" />-->
+<!--        <el-table-column :label="$t('article.id')" prop="ID">-->
+<!--          <template slot-scope="scope">-->
+<!--            <router-link :to="`/article/detail/${scope.row.ID}`" target="_blank" class="islide">-->
+<!--              <span>{{ scope.row.ID }}</span>-->
+<!--            </router-link>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
         <el-table-column :label="$t('article.title')" prop="TITLE">
           <template slot-scope="scope">
             <router-link :to="`/article/detail/${scope.row.ID}`" target="_blank" class="islide">
@@ -17,28 +17,32 @@
             </router-link>
           </template>
         </el-table-column><!--标题-->
-        <el-table-column :label="$t('article.category')"><!--分类-->
+        <el-table-column :label="$t('article.country')" prop="TITLE" width="220">
           <template slot-scope="scope">
-            {{ allData.allCategory[scope.row.CID].CATE_NAME }}
+            {{ scope.row.COUNTRY_NAME }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('article.sort')" width="100"> <!-- 排序 -->
+<!--        <el-table-column :label="$t('article.category')">&lt;!&ndash;分类&ndash;&gt;-->
+<!--          <template slot-scope="scope">-->
+<!--            {{ allData.allCategory[scope.row.CID].CATE_NAME }}-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <el-table-column :label="$t('article.sort')" width="80"> <!-- 排序 -->
           <template slot-scope="scope">
             <el-input v-model="scope.row.SORT" min="0" max="99" @change="handleChangeSort(scope.row, scope.row.SORT)" />
           </template>
         </el-table-column>
-        <el-table-column :label="$t('article.creationTime')"><!--创建时间-->
+        <el-table-column :label="$t('article.status')"> <!-- 状态 -->
           <template slot-scope="scope">
-            {{ tool.formatDate(scope.row.CREATED_AT) }}
+            <div v-if="scope.row.STATUS.value === '1'">{{$t('article.show')}}</div>
+            <div v-else>{{$t('article.hide')}}</div>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('article.status')"> <!-- 状态 -->
+        <el-table-column :label="$t('article.creationTime')"><!--创建时间-->
           <template slot-scope="scope">
-            <div v-if="scope.row.STATUS === '1'">{{$t('article.show')}}</div>
-            <div v-else>{{$t('article.hide')}}</div>
+            {{ scope.row.CREATED_AT.value }}
           </template>
         </el-table-column>
-
         <el-table-column fixed="right" :label="$t('article.action')" width="180"><!--操作-->
           <template slot-scope="scope">
             <el-dropdown size="small" trigger="click">
@@ -56,16 +60,16 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-dropdown size="small" trigger="click">
-          <el-button type="primary" size="small">
-            {{$t('common.selectData')}}<!--所选数据--><i class="el-icon-arrow-down el-icon--right" />
-          </el-button>
-          <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="delete" @click.native="handleMuliDel()">{{$t('common.delete')}}</el-dropdown-item>
-            <el-dropdown-item command="hide" @click.native="handleMultiHide()">{{$t('common.hide')}}</el-dropdown-item>
-            <el-dropdown-item command="un-hide" @click.native="handleMultiUnHide()">{{$t('common.unhide')}}</el-dropdown-item>
-          </el-dropdown-menu>
-        </el-dropdown>
+<!--        <el-dropdown size="small" trigger="click">-->
+<!--          <el-button type="primary" size="small">-->
+<!--            {{$t('common.selectData')}}&lt;!&ndash;所选数据&ndash;&gt;<i class="el-icon-arrow-down el-icon&#45;&#45;right" />-->
+<!--          </el-button>-->
+<!--          <el-dropdown-menu slot="dropdown">-->
+<!--            <el-dropdown-item command="delete" @click.native="handleMuliDel()">{{$t('common.delete')}}</el-dropdown-item>-->
+<!--            <el-dropdown-item command="hide" @click.native="handleMultiHide()">{{$t('common.hide')}}</el-dropdown-item>-->
+<!--            <el-dropdown-item command="un-hide" @click.native="handleMultiUnHide()">{{$t('common.unhide')}}</el-dropdown-item>-->
+<!--          </el-dropdown-menu>-->
+<!--        </el-dropdown>-->
         <el-button type="primary" size="small" @click="handleAdd">{{$t('article.newArticle')}}</el-button><!--添加文章-->
         <el-pagination
           :current-page="currentPage"