Changes

.env.development

@@ -5,13 +5,10 @@ VUE_APP_TITLE = 一七生活管理系统（测试）
 ENV = 'development'
 
 # 一七生活管理系统/开发环境
-# VUE_APP_BASE_API_HOST = 'http://localhost:9801'
-# VUE_APP_BASE_API = 'http://localhost:9801'
+VUE_APP_BASE_API_HOST = 'http://192.168.98.9:9801'
+VUE_APP_BASE_API = 'http://192.168.98.9:9801'
 # VUE_APP_BASE_API_HOST = 'http://139.224.65.227:8091/prod-api'
 # VUE_APP_BASE_API = 'http://139.224.65.227:8091/prod-api'
-VUE_APP_BASE_API_HOST = 'http://192.168.98.9:9801'
-VUE_APP_BASE_API = 'http://192.168.98.9:9801/'
-
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/components/Page/index.vue

@@ -2,7 +2,7 @@
     <el-card class="box-card" style="margin-top: 12px">
         <div class="table-pagination-container">
             <!-- 数据列表 -->
-            <el-table ref="table" :data="data" @selection-change="selectionChange" v-loading="isLoading" current-row-key="aaa" element-loading-text="给我一点时间" :show-header="showHeader"  fit highlight-current-row border stripe>
+            <el-table ref="table" :data="data" @selection-change="selectionChange" v-loading="isLoading" current-row-key="aaa" element-loading-text="给我一点时间" :show-header="showHeader" fit highlight-current-row border stripe>
                 <el-table-column header-align="center" align="center" type="selection" width="55" v-if="showCheck"> </el-table-column>
                 <el-table-column v-if="getShowIndex" align="center" :label="$t('message.index')">
                     <template slot-scope="scope">

src/views/activity/clothItem/index.vue

@@ -30,7 +30,7 @@
             <el-table-column label="衣服名称" align="center" prop="clothItemName" />
             <el-table-column label="指定折扣" align="center" prop="discount" />
             <!--            <el-table-column label="指定价格" align="center" prop="price" />-->
-            <el-table-column label="洗衣类型" align="center" prop="washModeName" />
+            <!--            <el-table-column label="洗衣类型" align="center" prop="washModeName" />-->
             <el-table-column label="创建人" align="center" prop="createBy" />
             <el-table-column label="创建时间" align="center" prop="createTime" />
             <el-table-column label="修改人" align="center" prop="updateBy" />

src/views/app/banner/index.vue

@@ -46,21 +46,28 @@
                     <el-image style="width: 80px; height: 80px" :src="scope.row.imgUrl" :preview-src-list="[scope.row.imgUrl]"> </el-image>
                 </template>
             </el-table-column>
-            <el-table-column label="图片类型" align="center" prop="bannerType">
-                <template slot-scope="scope">
-                    <dict-tag :options="dict.type.app_banner_type" :value="scope.row.bannerType" />
-                </template>
-            </el-table-column>
+            <el-table-column label="标题" align="center" prop="redirectTitle" />
+            <!--            <el-table-column label="图片类型" align="center" prop="bannerType">-->
+            <!--                <template slot-scope="scope">-->
+            <!--                    <dict-tag :options="dict.type.app_banner_type" :value="scope.row.bannerType" />-->
+            <!--                </template>-->
+            <!--            </el-table-column>-->
             <el-table-column label="点击类型" align="center" prop="clickType">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.app_banner_click_type" :value="scope.row.clickType" />
                 </template>
             </el-table-column>
+
             <el-table-column label="启用状态" align="center" prop="status">
                 <template slot-scope="scope">
                     <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status" />
                 </template>
             </el-table-column>
+            <el-table-column label="是否热销" align="center" prop="isHot" width="120" v-if="bannerType == 3">
+                <template slot-scope="scope">
+                    <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.isHot" />
+                </template>
+            </el-table-column>
             <el-table-column label="创建人" align="center" prop="createBy" />
             <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
             <el-table-column label="修改人" align="center" prop="updateBy" />
@@ -99,6 +106,11 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="24">
+                        <el-form-item label="标题" prop="redirectTitle">
+                            <el-input v-model="form.redirectTitle" placeholder="请输入标题" />
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="24" v-if="form.clickType == '1'">
                         <el-form-item label="跳转内容" prop="redirectContent">
                             <el-input v-model="form.redirectContent" placeholder="请输入跳转网址" />
@@ -109,11 +121,18 @@
                             <editor v-model="form.redirectContent" :min-height="192" />
                         </el-form-item>
                     </el-col>
-                  <el-col :span="24" v-if="form.clickType == '3'">
-                    <el-form-item label="跳转内容" prop="redirectContent">
-                      <el-input v-model="form.redirectContent" placeholder="请输入内部页面路径" />
-                    </el-form-item>
-                  </el-col>
+                    <el-col :span="24" v-if="form.clickType == '3'">
+                        <el-form-item label="跳转内容" prop="redirectContent">
+                            <el-input v-model="form.redirectContent" placeholder="请输入内部页面路径" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" v-if="bannerType == 3">
+                        <el-form-item label="是否热销" prop="isHot">
+                            <el-radio-group v-model="form.isHot">
+                                <el-radio-button v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio-button>
+                            </el-radio-group>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="24">
                         <el-form-item label="状态" prop="status">
                             <el-radio-group v-model="form.status" size="small">
@@ -136,7 +155,7 @@ import { listBanner, getBanner, delBanner, addBanner, updateBanner } from '@/api
 
 export default {
     name: 'Banner',
-    dicts: ['app_banner_type', 'app_banner_click_type', 'sys_normal_disable'],
+    dicts: ['app_banner_type', 'app_banner_click_type', 'sys_yes_no', 'sys_normal_disable'],
     data() {
         return {
             uploadAction: `${process.env.VUE_APP_BASE_API}` + '/common/uploadOSS',
@@ -169,7 +188,9 @@ export default {
                 updateById: null
             },
             // 表单参数
-            form: {},
+            form: {
+                isHot: 'N'
+            },
             // 表单校验
             rules: {
                 bannerType: [

src/views/app/delivery/index.vue

@@ -23,27 +23,16 @@
             <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" fit highlight-current-row border stripe :data="deliveryList" @selection-change="handleSelectionChange" fit highlight-current-row border stripe>
+        <Page uri="/mapi/app/delivery/page" :request-params="queryParams" ref="pagination">
             <el-table-column label="姓名" align="center" prop="realName" width="150" />
             <el-table-column label="手机号" align="center" prop="phoneNumber" width="150" />
             <el-table-column label="简介" align="center" prop="description" width="220" show-overflow-tooltip />
             <el-table-column label="等级" align="center" prop="level" />
-            <el-table-column label="积分" align="center">
-                <template slot-scope="scope">
-                    <span> {{ scope.row.pointBalance == null ? '0' : scope.row.pointBalance }}</span>
-                </template>
-            </el-table-column>
-            <el-table-column label="订单数量" align="center" prop="orderCount" />
             <el-table-column label="绑定门店数量" align="center">
                 <template slot-scope="scope">
                     <span> {{ scope.row.relationStoreNum == null ? '0' : scope.row.relationStoreNum }}</span>
                 </template>
             </el-table-column>
-            <el-table-column label="总接单数" align="center">
-                <template slot-scope="scope">
-                    <span> {{ scope.row.clothOrderTotalNum == null ? '0' : scope.row.clothOrderTotalNum }}</span>
-                </template>
-            </el-table-column>
             <el-table-column label="状态" align="center" prop="status">
                 <template slot-scope="scope">
                     <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
@@ -55,10 +44,7 @@
                     <el-button type="text" icon="el-icon-delete" @click="recordDetail(scope.row)" v-hasPermi="['app:delivery:edit']">接单记录</el-button>
                 </template>
             </el-table-column>
-        </el-table>
-
-        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
-
+        </Page>
         <!-- 添加或修改配送员对话框 -->
         <el-dialog :title="title" :visible.sync="open" size="50%" append-to-body>
             <el-row :gutter="10" style="margin-right: 20px; margin-left: 20px; width: 95%">
@@ -105,8 +91,8 @@
 
         <!--   接单记录 -->
         <el-dialog v-loading="loading" :title="recordDetailTitle" :visible.sync="openDetail" size="80%" append-to-body>
-            <div class="head-column1" style="margin-top: 40px">
-                <el-table v-loading="loading" fit highlight-current-row border stripe :data="recordDetailList">
+            <div class="head-column1" style="margin-top: 5px">
+                <el-table fit highlight-current-row border stripe :data="recordDetailList">
                     <el-table-column label="订单编号" align="center" prop="orderNo" width="200" />
                     <el-table-column label="门店名称" align="center" prop="storeName" width="150" />
                     <el-table-column label="派送员姓名" align="center" prop="realName" width="100" />
@@ -165,8 +151,6 @@ export default {
             openDetail: false,
             // 查询参数
             queryParams: {
-                pageNum: 1,
-                pageSize: 10,
                 appUserName: null,
                 phoneNumber: null
             },
@@ -212,11 +196,8 @@ export default {
         },
         /** 查询配送员列表 */
         getList() {
-            this.loading = true
-            listDelivery(this.queryParams).then((response) => {
-                this.deliveryList = response.data
-                this.total = response.data.length
-                this.loading = false
+            this.$nextTick(() => {
+                this.$refs.pagination.handleSearch(true)
             })
         },
         // 取消按钮