配置路径

.env.production

@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/mallapi'
+VUE_APP_BASE_API = '/lpkapi'
 
 ## 配置 正式接口地址
 VUE_APP_URL = ""

.gitignore

@@ -29,3 +29,4 @@ package-lock.json
 yarn.lock
 
 yyth-ui/
+yythmall-ui/

src/views/commodity/index.vue

@@ -15,10 +15,18 @@
 
             </el-form>
             <div class="btn" style="text-align: center;">
-							<el-button type="primary" size="small" icon="el-icon-search"
+              <el-button
-								@click="dosearch">查询</el-button>
+                type="primary"
-							<el-button type="primary" size="small" icon="el-icon-refresh"
+                size="small"
-								@click="resetQuery">重置</el-button>
+                icon="el-icon-search"
+                @click="dosearch"
+              >查询</el-button>
+              <el-button
+                type="primary"
+                size="small"
+                icon="el-icon-refresh"
+                @click="resetQuery"
+              >重置</el-button>
             </div>
           </div>
         </div>
@@ -50,7 +58,7 @@
                 />
               </template>
             </el-table-column>
-						<el-table-column label="小程序是否上架" align="center" width="140">
+            <el-table-column label="商品上架" align="center" width="140">
               <template slot-scope="scope">
                 <el-switch
                   v-model="scope.row.isAppletGrounding"
@@ -66,9 +74,13 @@
             <el-table-column label="商品图片" align="center">
               <template slot-scope="scope">
                 <el-popover placement="left" trigger="click" width="300">
-							   <img :src="scope.row.picUrl" width="100%" />
+                  <img :src="scope.row.picUrl" width="100%">
-							  <img slot="reference" :src="scope.row.picUrl" :alt="scope.row.picUrl"
+                  <img
-							    style="max-height: 70px;max-width: 70px; padding: 5px" />
+                    slot="reference"
+                    :src="scope.row.picUrl"
+                    :alt="scope.row.picUrl"
+                    style="max-height: 70px;max-width: 70px; padding: 5px"
+                  >
                 </el-popover>
                 <!-- <span v-for="(item,index) in scope.row.picUrl" :key="index">
 						      <el-popover placement="left" trigger="click" width="300">
@@ -89,8 +101,14 @@
         <div class="pages">
           <div class="tit" />
           <!--  翻页  -->
-					<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+          <pagination
-						:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+            v-show="dataList.length > 0"
+            :total="queryParams.total"
+            :page.sync="queryParams.current"
+            :limit.sync="queryParams.size"
+            class="pagination"
+            @pagination="loadList"
+          />
         </div>
       </div>
     </div>
@@ -210,7 +228,7 @@
 					size: 10,
 					total: 0,
 					params: {
-						name: '',
+						name: ''
 					}
 				}
 				this.loadList()
@@ -229,7 +247,6 @@
 				this.$refs['divadd'].showEdit(row)
 			},
 			toRelevancyInfo(row) {
-
 				const tip = '请确认是否删除所选商品?'
 				this.$confirm(tip, '提示', {
 					confirmButtonText: '确定',

src/views/order/allDistributionCount.vue

@@ -24,6 +24,16 @@
 
 							</el-form-item>
 
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+
+
 						</el-form>
 						<div class="btn" style="text-align: center;">
 							<el-button type="primary" size="small" icon="el-icon-search"
@@ -117,10 +127,29 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						store: ""
+						store: "",
+						cardType: ""
 					},
 				},
-				giftPackList: []
+				giftPackList: [],
+				cardTypeList: [{
+						text: "全部",
+						sid: ""
+					},
+					{
+						text: "家庭卡",
+						sid: "1"
+					},
+					{
+						text: "亲情卡",
+						sid: "2"
+					},
+					{
+						text: "企业卡",
+						sid: "3"
+					},
+
+				]
 			}
 		},
 		mounted() {
@@ -128,7 +157,7 @@
 		},
 		created() {
 			this.getAllStore()
-			this.loadList()
+			// this.loadList()
 		},
 		methods: {
 			//改变单行蓝色和绿色
@@ -180,7 +209,10 @@
 				console.log('>>>>>>>>>giftPackSelect', val)
 				this.page.params.store = val
 			},
-
+			cardTypeSelect(val) {
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -225,7 +257,8 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						store: ""
+						store: "",
+						cardType: ""
 					},
 				}
 				this.loadList()

src/views/order/distributionCount.vue

@@ -39,6 +39,15 @@
 									</el-option>
 								</el-select>
 							</el-form-item>
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+
 
 						</el-form>
 						<div class="btn" style="text-align: center;">
@@ -151,11 +160,30 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				},
 				giftPackList: [],
 				bankList: [],
+				cardTypeList: [{
+						text: "全部",
+						sid: ""
+					},
+					{
+						text: "家庭卡",
+						sid: "1"
+					},
+					{
+						text: "亲情卡",
+						sid: "2"
+					},
+					{
+						text: "企业卡",
+						sid: "3"
+					},
+
+				]
 			}
 		},
 		mounted() {
@@ -163,7 +191,7 @@
 		},
 		created() {
 			this.getAllStore()
-			this.loadList()
+			// this.loadList()
 			this.getBankList()
 		},
 		methods: {
@@ -230,7 +258,10 @@
 				console.log('>>>>>>>>>bankSelect', val)
 				this.page.params.bankSid = val
 			},
-
+			cardTypeSelect(val) {
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -276,7 +307,8 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				}
 				this.loadList()

src/views/order/index.vue

@@ -41,6 +41,17 @@
 								</el-select>
 							</el-form-item>
 							
+							
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+							
+
 						</el-form>
 						<div class="btn" style="text-align: center;">
 							<el-button type="primary" size="small" icon="el-icon-search"
@@ -139,11 +150,31 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid:""
+						bankSid:"",
+						cardType:""
 					},
 				},
 				giftPackList: [],
 				bankList: [],
+				cardTypeList:[
+					{
+						text :"全部",
+						sid:""
+					},
+					{
+						text :"家庭卡",
+						sid:"1"
+					},
+					{
+						text :"亲情卡",
+						sid:"2"
+					},
+					{
+						text :"企业卡",
+						sid:"3"
+					},
+					
+				]
 			}
 		},
 		mounted() {
@@ -151,7 +182,7 @@
 		},
 		created() {
 			this.getAllStore()
-			this.loadList()
+			// this.loadList()
 			this.getBankList()
 		},
 		methods: {
@@ -206,6 +237,10 @@
 				console.log('>>>>>>>>>bankSelect', val)
 				this.page.params.bankSid = val
 			},
+			cardTypeSelect(val){
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -251,7 +286,8 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid:""
+						bankSid:"",
+						cardType:""
 					},
 				}
 				this.loadList()

src/views/order/subBranch.vue

@@ -33,6 +33,16 @@
 								</el-select>
 							</el-form-item>
 
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+
+
 						</el-form>
 						<div class="btn" style="text-align: center;">
 							<el-button type="primary" size="small" icon="el-icon-search"
@@ -131,10 +141,29 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				},
-				bankList: []
+				bankList: [],
+				cardTypeList: [{
+						text: "全部",
+						sid: ""
+					},
+					{
+						text: "家庭卡",
+						sid: "1"
+					},
+					{
+						text: "亲情卡",
+						sid: "2"
+					},
+					{
+						text: "企业卡",
+						sid: "3"
+					},
+
+				]
 			}
 		},
 		mounted() {
@@ -142,7 +171,7 @@
 		},
 		created() {
 			this.getAllStore()
-			this.loadList()
+			// this.loadList()
 		},
 		methods: {
 
@@ -195,7 +224,10 @@
 				console.log('>>>>>>>>>bankSelect', val)
 				this.page.params.bankSid = val
 			},
-
+			cardTypeSelect(val) {
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req2.bankSelect()
 					.then(resp => {
@@ -244,7 +276,8 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				}
 				this.loadList()

vue.config.js

@@ -24,7 +24,7 @@ module.exports = {
    *在大多数情况下，请使用“/”！！！
    *详细信息：https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: process.env.NODE_ENV === 'production' ? '/mall/' : '/',
+  publicPath: process.env.NODE_ENV === 'production' ? '/lpk/' : '/',
   outputDir: 'yythmall-ui',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',