From 63bb4750121df03b5c6ea6710929479368b4c69b Mon Sep 17 00:00:00 2001
From: caolc <572275724@qq.com>
Date: Mon, 29 Aug 2022 09:45:23 +0800
Subject: [PATCH] 11

---
 .env.development                              |   2 +-
 .env.production                               |   2 +-
 README.md                                     |   2 +-
 package-lock.json                             |  14 ++-
 package.json                                  |  14 ++-
 public/index.html                             |   6 +-
 public/logo.png                               | Bin 0 -> 4116 bytes
 src/App.vue                                   |  21 +++-
 src/api/oil-site.js                           |   8 +-
 src/components/homeNavBar.vue                 |  45 +++++--
 src/components/listItem.vue                   |  69 ++++++++---
 src/components/paymentlListItem.vue           |  30 +++--
 src/main.js                                   |  27 +++++
 src/permission.js                             |  30 +++--
 src/router/index.js                           |   7 +-
 src/store/piniaIndex.js                       |  86 +++++++++++++-
 src/utils/addressResolution.js                |   5 +-
 src/utils/encode.js                           |   4 +-
 src/utils/mixin.js                            |   9 ++
 src/utils/request.js                          |  19 ++-
 src/views/HomeView.vue                        |  73 ++++++------
 src/views/cashier/cashierIndex.vue            |  17 +--
 src/views/cashier/components/detailsCard.vue  |  49 ++++++--
 .../cashier/components/detailsCardHeader.vue  |   9 +-
 src/views/cashier/paymentl.vue                |  26 ++--
 .../orderDetails/components/oilEvaluate.vue   | 112 +++++++++++-------
 src/views/orderDetails/components/oilGun.vue  | 108 +++++++++++++++--
 .../orderDetails/components/oilLable.vue      |   2 +-
 .../orderDetails/components/oilNextFooter.vue |  35 ++++--
 .../components/optionalOilLable.vue           |  37 +++---
 src/views/orderDetails/nextOrderDetails.vue   |   1 +
 src/views/orderDetails/orderDetailsIndex.vue  |   2 +-
 src/views/personalOrderList/index.vue         |  27 +++--
 vue.config.js                                 |  75 +++++++++++-
 34 files changed, 742 insertions(+), 231 deletions(-)
 create mode 100644 public/logo.png
 create mode 100644 src/utils/mixin.js

diff --git a/.env.development b/.env.development
index 49a0838..dfaf2c7 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_ENCRYPT = 'PUBLIC'
 
 VUE_APP_BASE_API = '/api'
-VUE_APP_BASE_LSM_API = '/lsm'cls
+VUE_APP_BASE_LSM_API = '/lsm'
 # 文件上传
 VUE_APP_UPLOAD_URL = '/api/oil-oss/obejct/uploadFile'
 VUE_APP_UPLOAD_PRIVATE_URL = '/api/oil-dict/imageHandler/uploadProtectedImg'
diff --git a/.env.production b/.env.production
index 5c534d9..db9e528 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@ ENV = 'production'
 
 # base api
 VUE_APP_ENCRYPT = 'PRIVATE'
-
+BASE_URL = '/h5'
 VUE_APP_BASE_API = '/adminapi'
 VUE_APP_BASE_LSM_API = '/lsm'
 # 文件上传
diff --git a/README.md b/README.md
index 82b4b07..4bbf788 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# company_h5
+# 星油能源
 
 ## Project setup
 ```
diff --git a/package-lock.json b/package-lock.json
index 0f329e8..bdd4272 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "company_h5",
+  "name": "星油能源",
   "version": "0.1.0",
   "lockfileVersion": 1,
   "requires": true,
@@ -3534,7 +3534,6 @@
       "version": "4.3.4",
       "resolved": "https://registry.npmmirror.com/debug/-/debug-4.3.4.tgz",
       "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
       "requires": {
         "ms": "2.1.2"
       }
@@ -5864,8 +5863,7 @@
     "ms": {
       "version": "2.1.2",
       "resolved": "https://registry.npmmirror.com/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
     },
     "multicast-dns": {
       "version": "7.2.5",
@@ -7391,6 +7389,14 @@
         "ajv-keywords": "^3.5.2"
       }
     },
+    "script-ext-html-webpack-plugin": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmmirror.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.5.tgz",
+      "integrity": "sha512-nMjd5dtsnoB8dS+pVM9ZL4mC9O1uVtTxrDS99OGZsZxFbkZE6pw0HCMued/cncDrKivIShO9vwoyOTvsGqQHEQ==",
+      "requires": {
+        "debug": "^4.2.0"
+      }
+    },
     "select-hose": {
       "version": "2.0.0",
       "resolved": "https://registry.npmmirror.com/select-hose/-/select-hose-2.0.0.tgz",
diff --git a/package.json b/package.json
index ac29c4a..a59dc51 100644
--- a/package.json
+++ b/package.json
@@ -3,10 +3,21 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "dev": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
   "dependencies": {
     "amfe-flexible": "^2.2.1",
     "axios": "^0.27.2",
@@ -20,6 +31,7 @@
     "postcss-px2rem": "^0.3.0",
     "postcss-pxtorem": "^5.1.1",
     "px2rem-loader": "^0.1.9",
+    "script-ext-html-webpack-plugin": "^2.1.5",
     "vant": "^2.12.48",
     "vue": "^2.6.14",
     "vue-qr": "^4.0.9",
diff --git a/public/index.html b/public/index.html
index 9f0bb9e..a6d002f 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,12 +6,12 @@
     <meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" >
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
    
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <link rel="icon" href="<%= BASE_URL %>logo.png">
+    <title><%= webpackConfig.name %></title>
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong>We're sorry but <%= webpackConfig.name %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->
diff --git a/public/logo.png b/public/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b045e213795cc3b1ac9fdb05e3017bbbb4e7bf06
GIT binary patch
literal 4116
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
Sv#9C-0000<MNUMnLSTY4(9Svl

literal 0
HcmV?d00001

diff --git a/src/App.vue b/src/App.vue
index e06c0cd..5bb4587 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,13 +1,17 @@
 <template>
   <div id="app">
-    <van-nav-bar v-if="navData.path == '/' ? false : true"
+    <van-nav-bar v-if="!$route.meta?.closeNavBar"
       style="background-color: #ff6700 !important;color: #ffffff !important;" :title="navData.meta.title"
       :border="false" :left-arrow="navData.path == '/' ? false : true" @click-left="onClickLeft"
-      @click-right="onClickRight" />
+      @click-right="onClickRight" /> 
     <transition :name="silderName">
-      <router-view :style="{ height: navData.path == '/' ? '' : 'calc(100vh - 46px)' }" class="routerView">
-      </router-view>
+      <keep-alive :include="['HomeView']"  >
+        <router-view  :style="{ height: navData.path == '/' ? '' : 'calc(100vh - 46px)' }" class="routerView"  ></router-view>
+      </keep-alive>
     </transition>
+     <!-- <transition  :name="silderName">
+      <router-view  :style="{ height: navData.path == '/' ? '' : 'calc(100vh - 46px)' }" class="routerView"></router-view>
+    </transition> -->
   </div>
 </template>
 <script>
@@ -40,8 +44,11 @@ export default {
     }
   },
   methods: {
+    routerBar(){
+
+    },
     onClickLeft() {
-      this.$router.go(-1)
+      this.$router.back()
       // this.$notify('点击返回');
     },
     onClickRight() {
@@ -51,10 +58,12 @@ export default {
 }
 </script>
 <style>
+.sa{
+  justify-content: space-around;
+}
 .bw {
   justify-content: space-between;
 }
-
 .routerView {
   overflow: auto;
 }
diff --git a/src/api/oil-site.js b/src/api/oil-site.js
index f45886f..4b45805 100644
--- a/src/api/oil-site.js
+++ b/src/api/oil-site.js
@@ -149,7 +149,13 @@ export default {
 	   }
 	  })
 	 },
-	 
+	 getCompanyInfo(data){
+		return request({
+			url: `/oil-identity/authorization/getCompanyInfo`,
+			method: 'post',
+			data:data
+		   })
+	 },
 	 //根据经纬度获取详情坐标
 	 getInfoBylAndL(longitude,Latitude) {
 	  return request({
diff --git a/src/components/homeNavBar.vue b/src/components/homeNavBar.vue
index 77b511e..dea3987 100644
--- a/src/components/homeNavBar.vue
+++ b/src/components/homeNavBar.vue
@@ -2,7 +2,7 @@
   <div class="homeNavBar_body">
     <div class="homeNavBar_body_title">
       <div class="vc homeNavBar_body_title_compantName">
-        <div class="textov">山东星卡互联物流有限公司......</div>
+        <div class="textov">{{$pinia.state.value.user.user?.networkName||'--'}}</div>
       </div>
       <div class="vc homeNavBar_body_title_right">
         <van-icon @click="golist" size="20" name="orders-o" />
@@ -20,17 +20,22 @@
     </div>
     <div :style="{height:isShow.filter?'':'0px'}" class="homeNavBar_body_filter">
       <van-tree-select 
-      @click-item="seleFn"
       style="margin-top:5px"
       :items="productCodeList" 
       :active-id.sync="activeId" 
       :main-active-index.sync="activeIndex" />
+      <div style="padding:10px 0;background-color: #ffffff;" class="flex sa">
+        <van-button @click="seleFn"  size="small"   type="danger">确定</van-button>
+        <van-button  @click="clearFn" size="small"   type="default">重置</van-button>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
 import filterList from '../components/oilType'
+import useStore from '@/store/piniaIndex';
+let store = useStore();
 export default {
   name: 'homeNavBar',
   props:{
@@ -41,19 +46,35 @@ export default {
   },
   data() {
     return {
+      timer:null,
       isShow:{
         filter:false
       },
       value:'',
       show: false,
-       activeId:'30#',
-      activeIndex: '0',
+       activeId:'',
+      activeIndex: '',
       items: filterList
     }
   },
-  created(){
+  created(){},
+  watch:{
+    activeId(n){
+      console.log(n,'activeId')
+    },
+    activeIndex(n){
+      console.log(n,'activeIndex')
+    },
+    networkName:function(){}
+  },
+  mounted(){
   },
   methods:{
+    clearFn(){
+      this.activeIndex='';
+      this.activeId='';
+      this.$emit("input", this.activeId);
+    },
     input(){
       this.$emit('seach',this.value)
     },
@@ -62,7 +83,8 @@ export default {
     },
     seleFn(){
       this.$emit("input", this.activeId);
-      this.isShow.filter = !this.isShow.filter
+      this.isShow.filter = !this.isShow.filter;
+      this.$emit('getlist')
     }
   },
 }
@@ -96,8 +118,13 @@ export default {
   height: 62px;
   width: 550px;
   margin-left: 20px;
+  flex: 1;
+}
+.homeNavBar_body_seach_input input{
+  box-sizing: border-box;
+  width: 100%;
+  padding: 0 10px;
 }
-
 .homeNavBar_body_seach_input {
   border-radius: 30px;
   border: none;
@@ -105,9 +132,11 @@ export default {
   width: 100%;
   padding-left: 20px;
   box-sizing: border-box;
-  font-size: 28px;
+  font-size: 25px;
   font-weight: 100;
   color: #000000;
+  // flex: 1;
+  // padding: 0 10px;
 }
 
 .homeNavBar_body_seach {
diff --git a/src/components/listItem.vue b/src/components/listItem.vue
index f586acf..1af0931 100644
--- a/src/components/listItem.vue
+++ b/src/components/listItem.vue
@@ -6,18 +6,17 @@
     <div class="list_item_body_informationContainer">
       <div class="list_item_body_title tv">{{ listItem.siteName || '暂无' }}</div>
       <div class="list_item_body_lable">
-        <div :style="{background:item.color}" v-for="(item,index) in lableArray " :key="index" class="list_item_body_lable_item">{{item.lable}}</div>
+        <div :style="{ background: item.color }" v-for="(item, index) in lableArray " :key="index"
+          class="list_item_body_lable_item">{{ item.lable }}</div>
       </div>
       <div class="list_item_body_tip tv">
         {{ listItem.address || '暂无' }}
       </div>
       <div class="flex ac list_item_body_footer">
         <span class="list_item_body_oilTypeText">{{ listItem.oilProductCode }}</span>
-        <span class="list_item_body_oilPriceText">￥{{ listItem.sitePrice.toFixed(2) }}</span>
-        <span class="list_item_body_oilDiscountText">省￥{{ Number((listItem.oilSitePrice -
-            listItem.sitePrice)).toFixed(2)
-        }}</span>
-        <span class="list_item_body_oilOriginaltText">￥{{ listItem.oilSitePrice.toFixed(2) }}/L</span>
+        <span class="list_item_body_oilPriceText">￥{{   moneyIntercept(listItem.sitePrice) }}</span>
+        <span class="list_item_body_oilDiscountText">省￥{{   Number((  moneyIntercept(listItem.oilSitePrice)  - moneyIntercept(listItem.sitePrice) )).toFixed(2) }}</span>
+        <span class="list_item_body_oilOriginaltText">￥{{  moneyIntercept(listItem.oilSitePrice) }}/L</span>
       </div>
     </div>
     <div class="list_item_body_left tv">{{ listItem.juli | distance }}</div>
@@ -28,6 +27,10 @@
 export default {
   name: "listItem",
   props: {
+    index:{
+      type:Number,
+      default:0
+    },
     listItem: {
       type: Object,
       default: () => null
@@ -42,6 +45,14 @@ export default {
   created() {
     this.lableGenerate()
   },
+  watch:{
+    listItem:{
+      handler(){
+            this.lableGenerate()
+      },
+      deep:true
+    }
+  },
   filters: {
     distance(e) {
       let defaulObj = e || null;
@@ -52,8 +63,15 @@ export default {
   methods: {
     lableGenerate() {
       this.lableArray = []
-      Object.keys(this.listItem).forEach(keys => {
+      Object.keys(this.listItem).forEach((keys, index) => {
         switch (keys) {
+          case 'siteType':
+            console.log(this.listItem.siteType,'siteType')
+              this.lableArray.push({
+                lable: this.listItem.siteType==1?'加油站':'加气站',
+                color: this.listItem.siteType==1?'#FF6700':'#00c15e'
+              })
+              break;
           case 'siteLevel':
             this.lableArray.push({
               lable: this.listItem['siteLevel'] + '级',
@@ -66,17 +84,31 @@ export default {
               color: this.listItem.channelCode == 'XOIL' ? 'red' : '#FF9000'
             })
             break;
-          case 'highSpeedMark' || 'roadTpye':
-           if(this.listItem.highSpeedMark&&this.listItem.roadTpye){
-             this.lableArray.push({
-              lable: this.speedMark(this.listItem.highSpeedMark, this.listItem.roadTpye) + (this.listItem.roadName ? this.listItem.roadName : ''),
-              color: this.speedMarkColor(this.listItem.highSpeedMark, this.listItem.roadTpye)
-            })
-           }
-            break
+          case 'highSpeedMark' :
+            if (this.listItem.highSpeedMark ) {
+              this.lableArray.push({
+                lable: this.speedMark(this.listItem.highSpeedMark, this.listItem.roadTpye) + (this.listItem.roadName ? this.listItem.roadName : ''),
+                color: this.speedMarkColor(this.listItem.highSpeedMark, this.listItem.roadTpye)
+              })
+            }
+            break;
+            case 'roadTpye':
+               if (this.listItem.roadTpye) {
+              this.lableArray.push({
+                lable: this.speedMark(this.listItem.highSpeedMark, this.listItem.roadTpye) + (this.listItem.roadName ? this.listItem.roadName : ''),
+                color: this.speedMarkColor(this.listItem.highSpeedMark, this.listItem.roadTpye)
+              })
+            }
+              break
+            
         }
       })
-      console.log(this.lableArray)
+       if (this.index == 0) {
+          this.lableArray.push({
+            lable: '距离最近',
+            color: '#FF6700'
+          })
+        }
     },
     speedMarkColor(val, data) {
       if (val == 0) {
@@ -105,9 +137,10 @@ export default {
         if (data == '2') {
           return '国道'
         }
-      }
-      if (val == 1) {
+      } else if (val == 1) {
         return '高速'
+      }else{
+        return '未知-'
       }
     },
     filterImg(e) {
diff --git a/src/components/paymentlListItem.vue b/src/components/paymentlListItem.vue
index 01729d5..6026a78 100644
--- a/src/components/paymentlListItem.vue
+++ b/src/components/paymentlListItem.vue
@@ -1,15 +1,16 @@
 <template>
-  <div @click="goDetails" class="paymentlListItem flex">
+  <div  class="paymentlListItem flex">
     <div class="paymentlListItem-title flex bw">
-      <span class="paymentlListItem-title-order-number">{{
-          listItem.orderSerialNumber
-      }}</span>
+      <span class="paymentlListItem-title-order-number">
+        {{listItem.orderSerialNumber}}
+            <van-icon size="17"  @click="copyFn({value:listItem.orderSerialNumber})" name="newspaper-o" />
+      </span>
       <span class="paymentlListItem-title-order-type">{{
           listItem.orderStatus | type
       }}</span>
     </div>
-    <div class="paymentlListItem-container flex">
-      <div class="paymentlListItem-container-left">
+    <div @click="goDetails" class="paymentlListItem-container flex">
+      <div style="" class="paymentlListItem-container-left">
         <div class="paymentlListItem-container-left-oilName">
           {{ listItem.siteName }}
         </div>
@@ -20,7 +21,7 @@
           {{ listItem.createTime }}
         </div>
       </div>
-      <div class="paymentlListItem-container-right flex">
+      <div style="flex:1" class="paymentlListItem-container-right flex">
         ￥{{ listItem.payRealAmount }}
       </div>
     </div>
@@ -35,6 +36,9 @@ export default {
       default: () => null,
     },
   },
+  created(){
+    console.log(this.copyFn)
+  },
   methods: {
     goDetails() {
       let playtype = (key) => {
@@ -82,6 +86,12 @@ export default {
 </script>
 
 <style scoped>
+.paymentlListItem-container-left{
+  flex:1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 .paymentlListItem-container-left-time {
   font-size: 24px;
   font-family: PingFang SC-中等, PingFang SC;
@@ -113,6 +123,11 @@ export default {
 .paymentlListItem-container-right {
   align-items: flex-end;
   display: flex;
+  justify-content: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+
 }
 
 .paymentlListItem {
@@ -127,6 +142,7 @@ export default {
 .paymentlListItem-container {
   flex: 1;
   width: 100%;
+  overflow: hidden;
 }
 
 .paymentlListItem-title {
diff --git a/src/main.js b/src/main.js
index b0cd667..c1a263a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -11,7 +11,34 @@ import "@/assets/iconfont/iconfont.css";
 const pinia = createPinia()
 Vue.use(Vant).use(PiniaVuePlugin);
 Vue.config.productionTip = false
+Vue.prototype.copyFn = function(e){
+      if (navigator.clipboard && window.isSecureContext) {
+        navigator.clipboard.writeText(e.value);
+        this.$toast('复制成功');
+      } else {
+        let input = document.createElement('input');
+        input.setAttribute('value', e.value);
+        document.body.appendChild(input);
+        input.select();
+        try {
+          var copyed = document.execCommand("copy");
+          if (copyed) {
+            document.body.removeChild(input);
+            this.$toast('复制成功');
+          }
+        } catch {
+          this.$toast("复制失败，请检查浏览器兼容");
+        }
 
+      }
+}
+Vue.prototype.moneyIntercept  = function(value){
+  if (value != 'xxx.x') {
+    return String(value).split('.')[1]&&String(value).split('.')[1].length>2? Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0,1)}${ Number(String(value).split('.')[1].substring(1,2)) + 1}`)  :Number(value).toFixed(2);
+  } else {
+    return Number(value).toFixed(2)
+  }
+}
 new Vue({
   pinia,  
   router,
diff --git a/src/permission.js b/src/permission.js
index 01d6474..f96955f 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,24 +1,40 @@
 import router from './router';
 import useStore from './store/piniaIndex';
 import { addressResolution } from '@/utils/addressResolution';
-import { getToken } from '@/utils/auth'
+import { getToken, setToken, removeToken, setUsername, setPassword, setChecked, removeChecked, removeUsername, removePassword } from '@/utils/auth'
 import { Notify } from 'vant';
 
 
 router.beforeEach(async (to, from, next) => {
     //pinia挂载顺序问题异步处理路由拦截
     setTimeout(() => {
-        let store = useStore();
-        let token = getToken()
-        if (!token) {
-            let data = addressResolution(window.location.href);
+        let store = useStore(); //获取状态
+        let token = getToken(); //获取cookie
+        let data = addressResolution(window.location.href);//获取当前地址
+        console.log(data,'当前地址参数解析')
+        //如果有token且token不相同 更新token
+        if( token && token!==data?.accessToken) {
             if (typeof data == 'object' && data?.accessToken) {
-                store.login(data.accessToken)
+                console.log(token,'检测到token更新')
+                store.login(data);
+                token = getToken();
             }
         }
+        //刷新配置
+        if(token&&!store.user){
+            store.getUser()
+        }
+        //检测到没有token直接登录
+        if (!token) {
+            console.log( typeof data, '没有token')
+            if (typeof data == 'object' && data?.accessToken) {
+                store.login(data)
+            }
+        } 
+        //拦截 如果不是去首页 还没有token直接去首页
         if (to.path !== '/' && !token) {
             Notify('请检查登陆状态')
-            next('/')
+            next({path:'/'})
         } else {
             next()
         }
diff --git a/src/router/index.js b/src/router/index.js
index 3076a6c..1df2961 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -5,7 +5,7 @@ Vue.use(VueRouter)
 
 const routes = [
   {
-    meta: { title: '首页', index: 0 },
+    meta: { title: '首页', index: 0,closeNavBar:true },
     path: '/',
     name: 'home',
     component: () => import('../views/HomeView.vue')
@@ -23,8 +23,9 @@ const routes = [
     component: () => import('../views/orderDetails/orderDetailsIndex.vue'),
   },
   {
-    meta: { title: '油站详情', index: 2 },
+    meta: { title: '油站详情', index: 2, keepAlive: true },
     path: '/nextOrderDetails',
+    name: 'nextOrderDetails',
     component: () => import('../views/orderDetails/nextOrderDetails.vue'),
   },
   {
@@ -41,7 +42,7 @@ const routes = [
   }
 ]
 
-const router = new VueRouter({
+const router = new VueRouter({    
   mode: 'history',
   base: process.env.BASE_URL,
   routes
diff --git a/src/store/piniaIndex.js b/src/store/piniaIndex.js
index d5ad117..245ef1e 100644
--- a/src/store/piniaIndex.js
+++ b/src/store/piniaIndex.js
@@ -1,6 +1,8 @@
 import { defineStore } from 'pinia'
 import { getToken, setToken, removeToken, setUsername, setPassword, setChecked, removeChecked, removeUsername, removePassword } from '@/utils/auth'
-
+import oilSite from '@/api/oil-site'
+import { Notify } from 'vant';
+import utils from '@/utils/encode'
 const useUserStore = defineStore('user', {
   state: () => {
     return {
@@ -10,7 +12,7 @@ const useUserStore = defineStore('user', {
       user: null,
       position: {
         latitude: '',
-        longitude: ''
+        longitude: '',
       }
     }
   },
@@ -24,10 +26,84 @@ const useUserStore = defineStore('user', {
         state.username = username
       })
     },
-
-    login(token) {
+    getPosition(){
+      let that = this
+      if(navigator?.geolocation?.getCurrentPosition){
+        navigator.geolocation.getCurrentPosition(function (position) {
+          that.$patch((state) => {
+            ({latitude:state.position.latitude,longitude:state.position.longitude}=position.coords);
+          localStorage.setItem('position',JSON.stringify(state.position))
+            console.log(state.position,position.coords,'检测到地理位置授权')
+          })
+        },(error)=>{
+          switch (error.code) {
+            case error.PERMISSION_DENIED:
+              Notify({
+                message:'用户拒绝对获取地理位置的请求。',
+                type: 'danger',
+                duration:1000
+              })
+                break;
+            case error.POSITION_UNAVAILABLE:
+              Notify({
+                message:'位置信息是不可用的。',
+                type: 'danger',
+                duration:1000
+              })
+                break;
+            case error.TIMEOUT:
+              Notify({
+                message:'请求用户地理位置超时。',
+                type: 'danger',
+                duration:1000
+              })
+                break;
+            case error.UNKNOWN_ERROR:
+              Notify({
+                message:'未知错误。',
+                type: 'danger',
+                duration:1000
+              })
+                break;
+        }
+        });
+      }else{
+        console.log('浏览器不兼容位置api')
+      }
+    },
+    getUser(){
+      console.log('获取user信息')
+      return new Promise((resolve, reject) => {
+        oilSite.getCompanyInfo({
+          accessToken : utils.decrypt(getToken(),'Clco2uJjhZRgDHzl')
+        }).then(res=>{
+          this.$patch((state) => {
+            state.user = res.data;
+          })
+          resolve(this.user)
+        })
+      })
+     
+    },
+    login(data) {
+      console.log(data,'登陆方法')
+      let token = data.accessToken;
       this.token = token;
-      setToken(token)
+      setToken(token);
+      console.log(getToken(),'getToken()')
+      this.getUser();
+      if(data?.latitude&&data?.longitude){
+          ({latitude:this.position.latitude,longitude:this.longitude}=data);
+          localStorage.setItem('position',JSON.stringify(this.position))
+      }else{
+         console.log(data,'地理位置参数错误,手动获取位置')
+        this.getPosition()
+      }
+      return true
+    },
+    clearToken(){
+      console.log('清楚token方法')
+      removeToken()
     }
   }
 });
diff --git a/src/utils/addressResolution.js b/src/utils/addressResolution.js
index 4bd0ebe..31a9bf4 100644
--- a/src/utils/addressResolution.js
+++ b/src/utils/addressResolution.js
@@ -1,17 +1,18 @@
 
+import utils from '@/utils/encode'
 function addressResolution(url){
     if(!url|| typeof url!=='string'){
         return '地址解析格式错误'
     }
-    
     let a = url.split('?')[1]||'';
+    
     if(a!==''&& (a.split('&').length!==0||a.split('&&').length!==0)){
         let b = a.split('&')||a.split('&&');
         let c = {};
         b.forEach(item=>{
             let key = item.split('=')[0];
             let value = item.split('=')[1];
-            c[key] = value
+            c[key] = value 
         });
         return c
     }else{
diff --git a/src/utils/encode.js b/src/utils/encode.js
index 50b3c18..f7b6808 100644
--- a/src/utils/encode.js
+++ b/src/utils/encode.js
@@ -15,8 +15,8 @@ export default {
     var encrypted = CryptoJS.AES.encrypt(srcs, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 }) // 加密模式为ECB，补码方式为PKCS5Padding（也就是PKCS7）
     return encrypted.toString()
   },
-  decrypt(word) { // 解密
-    var key = CryptoJS.enc.Utf8.parse(keyStr)
+  decrypt(word,key = keyStr) { // 解密
+    var key = CryptoJS.enc.Utf8.parse(key)
     var decrypt = CryptoJS.AES.decrypt(word, key, { mode: CryptoJS.mode.ECB, padding: CryptoJS.pad.Pkcs7 })
     return CryptoJS.enc.Utf8.stringify(decrypt).toString()
   },
diff --git a/src/utils/mixin.js b/src/utils/mixin.js
new file mode 100644
index 0000000..63b4a33
--- /dev/null
+++ b/src/utils/mixin.js
@@ -0,0 +1,9 @@
+const mixin = {
+    data() {
+      return {
+        msg: "我是张三"
+      }
+    },
+    methods: {},
+  }
+  export default mixin;
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index cfe3959..58f2327 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,8 +3,9 @@ import { Notify } from 'vant';
 import utils from '@/utils/encode'
 import { getToken } from '@/utils/auth'
 import useStore from '@/store/piniaIndex';
+import { Toast } from 'vant';
+
 const CancelToken = axios.CancelToken;
-const token = getToken()
 const timeout = 20000
 const WhiteApiErr = ['userSavePermissionByPhone','batchEnableDisable','batchPriceEnableDisable','getPushOrderInfo']
 const service = axios.create({
@@ -19,6 +20,11 @@ let a = []
 // request 拦截器
 service.interceptors.request.use(
   config => {
+    Toast.loading({
+      message: '加载中...',
+      forbidClick: true,
+      duration:0
+    });
     let source = CancelToken.source();
     config.cancelToken = source.token;
     if(a.includes(config.url)){
@@ -33,9 +39,12 @@ service.interceptors.request.use(
     }
     const notEncrypt = config.notEncrypt
     config.headers['dataSources'] = 'WEB'
+    let  token = getToken();
+    console.log(getToken(),'getTokengetTokengetTokengetTokengetToken')
     if (token) {
-      config.headers['Authorization'] = token;
-      console.log(token,'****************************')
+      console.log(token,'tokentokentokentoken')
+      config.headers['Authorization'] =  utils.decrypt(token,'Clco2uJjhZRgDHzl') ;
+      console.log(config.headers,'Authorization')
     }
     const JSESSIONID = utils.uuid()
     config.headers['JSESSIONID'] = JSESSIONID
@@ -88,6 +97,7 @@ service.interceptors.request.use(
 // response 拦截器
 service.interceptors.response.use(
   response => {
+    Toast.clear()
    let urlIndex = a.indexOf(response.config.url)
     if(urlIndex!==-1){
       a.splice(urlIndex,1);
@@ -131,6 +141,8 @@ service.interceptors.response.use(
           type: 'danger',
           duration: 5 * 1000
         })
+        // let store = useStore();
+        // store.clearToken()
         // store.dispatch('user/resetToken').then(() => {
         //   location.reload()
         // })
@@ -147,6 +159,7 @@ service.interceptors.response.use(
           return Promise.reject(new Error(res.message || '操作失败'))
         }
       } else {
+        // Toast.success(res.msg)
         return res
       }
     }
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index a0d5b9a..88588a6 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="home">
-    <homeNavBar v-model="page.params.oilProductCode" :productCodeList="productCodeList" @seach="seach" ref="homeNavBar" />
+    <homeNavBar @getlist="onRefresh" v-model="page.params.oilProductCode" :productCodeList="productCodeList" @seach="seach" ref="homeNavBar" />
     <div :style="{}" id="list" class="list">
       <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-        <van-list @load="onLoad" v-model="loading" :finished="finished" finished-text="没有更多了">
+        <van-list id =  'vanList' ref="vanList"  @load="onLoad" v-model="loading" :finished="finished" finished-text="没有更多了">
           <van-cell v-for="(item, index) in list" :key="index">
             <div @click="goDetails(item)" slot>
-              <listItem ref="listItem" :listItem="item" />
+              <listItem ref="listItem" :index="index" :listItem="item" />
             </div>
           </van-cell>
         </van-list>
@@ -16,7 +16,6 @@
 </template>
 
 <script>
-import useStore from '../store/piniaIndex';
 import homeNavBar from '@/components/homeNavBar.vue'
 import listItem from '@/components/listItem.vue'
 import oilSiteApi from '@/api/oil-site.js'
@@ -59,24 +58,19 @@ export default {
     }
   },
   created() {
-
+    console.log('created')
   },
   mounted() {
-    this.init()
+    this.init();
+    console.log(this.$refs.vanList,'/////')
   },
   watch: {
     'page.params.oilProductCode':function(n){},
-    loading: function (n) {},
-    position: function (n) {
-       let store = useStore();
-      store.setPosition({latitude:n.coords.latitude,longitude:n.coords.longitude});
-      this.page.params.latitude = n.coords.latitude;
-      this.page.params.longitude = n.coords.longitude;
-      this.getlist();
-      console.log(n, '检测到地理位置授权')
-    }
   },
   methods: {
+    listCheck(){
+      console.log(arguments,'listCheck')
+    },
     getmenu(){
       oilSiteApi.getCheckInfo().then(res=>{
         this.productCodeList = [];
@@ -93,10 +87,9 @@ export default {
       this.onRefresh()
     },
     onLoad() {
-     if(this.position){
+      if(this.refreshing) return
         this.page.currentPage += 1
           this.getlist()
-     }
     },
     goDetails(item) {
       this.$router.push({
@@ -110,26 +103,40 @@ export default {
       this.page.currentPage = 1;
       this.getlist();
     },
-    // onscroll() {
-    //   let that = this
-    //   let container = document.getElementById('list');
-    //   container.onscroll = function (e) {
-    //     if (Math.ceil(e.currentTarget.scrollTop + e.currentTarget.clientHeight) >= e.currentTarget.scrollHeight) {   //容差：20px
-    //       that.page.currentPage += 1
-    //       that.getlist()
-    //       console.log(that.page.currentPage, '滚动到底部');
-    //     }
-    //   };
-    // },
+    onscroll() {
+      let that = this
+      let container = document.getElementById('vanList');
+      container.onscroll = function (e) {
+          console.log(e.currentTarget.scrollTop, '滚动到底部');
+
+        if (Math.ceil(e.currentTarget.scrollTop + e.currentTarget.clientHeight) >= e.currentTarget.scrollHeight) {   //容差：20px
+          console.log(e.currentTarget.scrollTop, '滚动到底部');
+        }
+      };
+    },
     init() {
-      this.getPosition();
+      this.getlist();
       this.homeNavBarStyle = this.$refs.homeNavBar.$el.clientHeight;
-      // this.onscroll();
       this.getmenu();
+      // this.onscroll()
+    },
+    positionChenk(position){
+      return !position?.latitude&&!position?.longitude?true:false
     },
     getlist() {
+      let position = this.$pinia.state.value.user.position
+      console.log(Object.assign(this.page.params,position),position,'地理位置数据')
+      if(this.positionChenk(position)){
+        position = JSON.parse(localStorage.getItem("position"))
+        if(this.positionChenk(position)){
+        console.log(position,this.$pinia.state.value.user.position,'地理位置错误');
+        this.finished = true
+        return
+        }
+      }
+      this.page.params = Object.assign(this.page.params,position)
       this.loading = true
-      oilSiteApi.getSiteList(this.page).then(res => {
+      oilSiteApi.getSiteList( this.page).then(res => {
         if (res.code == 20000) {
            if (res.data.list.length < 10) {
               this.finished = true
@@ -140,7 +147,7 @@ export default {
             this.list = this.list.concat(res.data.list);
           }
           this.loading = false
-          this.refreshing = false;
+          this.refreshing = false;  
         }
         console.log(res)
       }).catch(error => {
@@ -151,7 +158,7 @@ export default {
       let that = this
       navigator.geolocation.getCurrentPosition(function (position) {
         that.position = position
-      });
+      },this.showError);
     },
     onClickLeft() {
     },
diff --git a/src/views/cashier/cashierIndex.vue b/src/views/cashier/cashierIndex.vue
index 6e689c3..a162cd6 100644
--- a/src/views/cashier/cashierIndex.vue
+++ b/src/views/cashier/cashierIndex.vue
@@ -96,7 +96,7 @@ export default {
         }
     },
      created(){
-        this.orderData = this.$route.params.order;
+        this.orderData = JSON.parse(this.$route.query.order);
        this.time =  this.getCountDownTime(this.orderData.createTime);
        this.updateDetails();
        this.cardListFn();
@@ -113,7 +113,7 @@ export default {
             this.detailsList[1][1].value = this.orderData.oilsCode + ' '+ this.orderData.oilsBar+'号枪' ||'暂无数据';
             this.detailsList[1][2].value = Number(this.orderData.volume).toFixed(2) + 'L'||'暂无数据';
             this.detailsList[2][0].value = '￥'+Number(this.orderData.xoilAmountGun).toFixed(2)|| '￥'+Number(this.orderData.baseRealPriceAmount).toFixed(2)||'暂无数据';
-            this.detailsList[2][1].value = '-￥'+Number(this.orderData.oilDiscountAmount).toFixed(2)||'-￥'+Number(this.orderData.discountAmount).toFixed(2)||'暂无数据';
+            this.detailsList[2][1].value = '-￥'+Number(this.orderData.oilDiscountAmount).toFixed(2)||'-￥'+ Number(this.orderData.discountAmount).toFixed(2)||'暂无数据';
             this.detailsList[2][2].value = '-￥'+Number(this.orderData.couponDiscountAmount).toFixed(2)||'暂无数据';
             this.detailsList[3][0].value = '￥'+Number(this.orderData.realAmount).toFixed(2)||'暂无数据';
         },
@@ -134,19 +134,20 @@ export default {
 					"orderSerialNumber": this.orderData.orderSerialNumber, //类型：String  必有字段  备注：订单编号
 					"payChannel": "BALANCE_PAYMENT", //类型：String  必有字段  备注：支付渠道（BALANCE_PAYMENT：余额支付）
 					"orderMethod": "CUSTOMER_ACTIVE", //类型：String  必有字段  备注：订单产生方式（CUSTOMER_ACTIVE：客户扫码支付：客户扫描油站二维码完成支付）
-					"createSource": "XOIL_DRIVER_COMPANY_WECHAT_APPLET"
+					"createSource": "XOIL_DRIVER_COMPANY_WECHAT_APPLET",
+                    oilCardType:-1
 				}
-                let orderType  = 0
+                let orderType  = false
             oilOrderApi.payOrder(payData).then(res=>{
                 if(res.code==20000){
-                    orderType = 1
+                    orderType = true
                 }
             }).finally((e)=>{
                 this.$router.push({
                     name:'paymentl',
-                    params:{
-                        orderData:this.orderData,
-                        orderType:orderType
+                    query:{
+                        orderData:JSON.stringify(this.orderData),
+                        type:JSON.stringify(orderType)
                     }
                 })
             })
diff --git a/src/views/cashier/components/detailsCard.vue b/src/views/cashier/components/detailsCard.vue
index 802fd34..106af00 100644
--- a/src/views/cashier/components/detailsCard.vue
+++ b/src/views/cashier/components/detailsCard.vue
@@ -1,15 +1,14 @@
 <template>
-  <div :style="{boxShadow:boxShadow?'':'none'}" class="payment-details">
-    <div  v-if="title" v-html="title" class="payment-details-title flex ac jc"></div>
+  <div :style="{ boxShadow: boxShadow ? '' : 'none' }" class="payment-details">
+    <div v-if="title" v-html="title" class="payment-details-title flex ac jc"></div>
     <div class="payment-details-container">
-      <div
-        v-for="(item, index) in detailsList"
-        :key="index"
-        class="payment-details-item"
-      >
-        <div   v-for="(items,indexs) in item" :key="indexs"  class="payment-details-item-row flex ac bw">
+      <div v-for="(item, index) in detailsList" :key="index" class="payment-details-item">
+        <div v-for="(items, indexs) in item" :key="indexs" class="payment-details-item-row flex ac bw">
           <span class="payment-details-item-row-lable">{{ items.lable }}</span>
-          <span :style="{color:items.valueStyle?.color?items.valueStyle.color:''}" >{{ items.value }}</span>
+          <span :style="{ color: items.valueStyle?.color ? items.valueStyle.color : '' }">
+            {{ items.value }}
+            <van-icon size="20" v-if="items.lable == '订单编号：'" @click="copy(items)" name="newspaper-o" />
+          </span>
         </div>
       </div>
       <div v-if="statistics" class="payment-details-item">
@@ -26,7 +25,7 @@
 export default {
   name: "detailsCard",
   props: {
-     boxShadow: {
+    boxShadow: {
       type: Boolean,
       default: true,
     },
@@ -43,6 +42,30 @@ export default {
       default: () => [],
     },
   },
+  methods: {
+    copy(e) {
+      if (navigator.clipboard && window.isSecureContext) {
+        navigator.clipboard.writeText(e.value);
+        this.$toast('复制成功');
+      } else {
+        let input = document.createElement('input');
+        input.setAttribute('value', e.value);
+        document.body.appendChild(input);
+        input.select();
+        try {
+          var copyed = document.execCommand("copy");
+          if (copyed) {
+            document.body.removeChild(input);
+            this.$toast('复制成功');
+          }
+        } catch {
+          this.$toast("复制失败，请检查浏览器兼容");
+        }
+
+      }
+
+    }
+  }
 };
 </script>
 <style>
@@ -55,15 +78,19 @@ export default {
 .payment-details-item-row-lable {
   color: #999999;
 }
+
 .payment-details-item-row {
   margin-top: 10px;
 }
+
 .payment-details-item:first-child {
   margin-top: 0q;
 }
+
 .payment-details-item:last-child {
   border-bottom: dashed 0px #b9b9b9;
 }
+
 .payment-details-item {
   box-sizing: border-box;
   border-bottom: dashed 1px #b9b9b9;
@@ -76,6 +103,7 @@ export default {
   margin-top: 30px;
   padding: 0 20px;
   box-sizing: border-box;
+  padding-top: 10px;
 }
 
 .payment-details-title {
@@ -90,6 +118,7 @@ export default {
   font-weight: normal;
   color: #333333;
 }
+
 .payment-details {
   width: 690px;
   background: #ffffff;
diff --git a/src/views/cashier/components/detailsCardHeader.vue b/src/views/cashier/components/detailsCardHeader.vue
index 9c1c9ee..3423afc 100644
--- a/src/views/cashier/components/detailsCardHeader.vue
+++ b/src/views/cashier/components/detailsCardHeader.vue
@@ -4,7 +4,10 @@
         <img v-if="!codeTpe.switch" class="paymentl-header-img" :src="codeTpe.imgType? cg :sb " alt="">
         <div v-else class="paymentl-vue-qr">
             <vue-qr v-if="codeTpe.codeValue" :text="codeTpe.codeValue"></vue-qr>
-            <div class="paymentl-vue-qr-tip">提示：该二维码每隔3分钟自动刷新一次</div>
+            <div class="paymentl-vue-qr-tip">
+                <van-count-down style="color:#999999" format="mm:ss" :time="countTimer" />
+                提示：该二维码每隔3分钟自动刷新一次
+                </div>
         </div>
     </div>
 </template>
@@ -14,6 +17,10 @@ import vueQr from 'vue-qr'
 
 export default {
     props: {
+        countTimer:{
+            type:Number,
+            default:0
+        },
         codeTpe: {
             type: Object,
             default: () => {
diff --git a/src/views/cashier/paymentl.vue b/src/views/cashier/paymentl.vue
index ca6c6d0..60faea0 100644
--- a/src/views/cashier/paymentl.vue
+++ b/src/views/cashier/paymentl.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="paymentl">
-    <detailsCardHeader :codeTpe="codeTpe" ></detailsCardHeader>
-    <detailsCard :title=" codeTpe.imgType?   '请提醒加油员使用  <span>“星油云站”</span> 进行订单核实':  '支付<span>“失败”</span> 请重新支付 '   " :detailsList="detailsList"></detailsCard>
+    <detailsCardHeader :countTimer='countTimer' :codeTpe="codeTpe" ></detailsCardHeader>
+    <detailsCard  :detailsList="detailsList"></detailsCard>
     <div @click="goHome" class="paymentl-footer flex ac jc">返回首页</div>
   </div>
 </template>
@@ -10,7 +10,9 @@
 import vueQr from 'vue-qr'
 import detailsCard from "./components/detailsCard.vue";
 import detailsCardHeader from "./components/detailsCardHeader.vue";
-	import oilSiteApi from '@/api/oil-site.js'
+import oilSiteApi from '@/api/oil-site.js';
+import useStore from '@/store/piniaIndex';
+ let store = useStore();
 export default {
   components: {
     detailsCard,
@@ -19,6 +21,7 @@ export default {
   },
   data() {
     return {
+      user:store.user,
       countTimer:180,
       timer:null,
       codeTpe:{
@@ -87,7 +90,7 @@ export default {
           },
           {
             lable: '加油司机：',
-            value: '孙司机(100038)',
+            value: (store.user&&store.user.name)||'---',
           },
           {
             lable: '油卡性质：',
@@ -99,30 +102,31 @@ export default {
     };
   },
   created(){
+    console.log(this.user,'user')
     this.init()
   },
   watch:{
     countTimer:function(n){
-      console.log(n,'+++')
     }
   },
   methods:{
     init(){
-      this.orderData = this.$route.params.orderData
-      this.codeTpe.imgType = this.$route.params.type
+      this.orderData = JSON.parse(this.$route.query.orderData)
+      this.codeTpe.imgType = JSON.parse(this.$route.query.type)
       console.log(this.codeTpe.imgType)
       this.getCode();
       this.updateDetails();
     },
     Timekeeping(){
-      this.countTimer = 180
+      this.countTimer = 180000
       this.timer = setInterval(()=>{
         if(this.countTimer==0){
           clearInterval(this.timer);
+          this.getCode()
           return
         }
-        this.countTimer-=1;
-      },100)
+        this.countTimer-=10;
+      },10)
     },
     goHome(){
       this.$router.push('/')
@@ -134,7 +138,7 @@ export default {
       this.detailsList[1][2].value =  `${Number(this.orderData.volume).toFixed(2)}L`;
       this.detailsList[1][3].value =  this.orderData.siteUserName  ;
       this.detailsList[2][0].value = '￥'+this.orderData.realAmount  ;
-      this.detailsList[2][1].value = '￥'+this.orderData.oilDiscountAmount  ;
+      this.detailsList[2][1].value = '￥'+ Number(this.orderData.oilDiscountAmount).toFixed(2)  ;
       this.detailsList[3][0].value = this.orderData.plateNumber  ;
       // this.detailsList[3][2].value = '￥'+this.orderData.plateNumber  ;
     },
diff --git a/src/views/orderDetails/components/oilEvaluate.vue b/src/views/orderDetails/components/oilEvaluate.vue
index 41fd66f..0a620e2 100644
--- a/src/views/orderDetails/components/oilEvaluate.vue
+++ b/src/views/orderDetails/components/oilEvaluate.vue
@@ -4,91 +4,119 @@
       <div class="oilEvaluate-text flex">
         <span>客户评价</span>
         <div class="oilEvaluate-lable flex">
-          <div  class="oilEvaluate-lable-item">服务周到</div>
-          <div  class="oilEvaluate-lable-item">交通便利</div>
-          <div  class="oilEvaluate-lable-item">便捷高效</div>
-          
+          <div class="oilEvaluate-lable-item">服务周到</div>
+          <div class="oilEvaluate-lable-item">交通便利</div>
+          <div class="oilEvaluate-lable-item">便捷高效</div>
+
         </div>
       </div>
-      <div v-if="oilDetails.oilSiteOrderInfoVos"  class="oilEvaluate-order-body flex">
+      <div v-if="oilDetails.oilSiteOrderInfoVos" class="oilEvaluate-order-body flex">
         <span class="oilEvaluate-order-text">客户订单</span>
         <div class="oilEvaluate-order">
           <div v-for="(item, index) in oilDetails.oilSiteOrderInfoVos" :key="index" class="oilEvaluate-order-item flex">
             <div>
-              <span>{{item.userName|usernameF}} </span>
-              <span> {{item.plateNumber|plateNumberF}}</span>
+              <span>{{ item.userName | usernameF }} </span>
+              <span> {{ item.plateNumber | plateNumberF }}</span>
             </div>
             <div>
-              <span>加 {{item.oilsCode}} {{Number(item.volume).toFixed(2)}}L 节省 <span class="red">￥{{item.discountAmount}}</span> </span>
+              <span>加 {{ item.oilsCode }} {{ Number(item.volume).toFixed(2) }}L 节省 <span class="red">￥{{
+                 Number(item.discountAmount).toFixed(2)
+              }}</span> </span>
             </div>
           </div>
         </div>
       </div>
     </div>
     <div class="oilEvaluate-footer">
-      <van-button @click="gopaly('/nextOrderDetails')" class="oilEvaluate-footer-butten" block color="#FF6700" type="primary">一键支付</van-button>
+      <van-button :disabled="!open" @click="gopaly('/nextOrderDetails')" class="oilEvaluate-footer-butten" block
+        color="#FF6700" type="primary">一键支付</van-button>
       <!-- <van-button class="oilEvaluate-footer-butten" block color="#FF6700" type="primary">二维码支付</van-button> -->
     </div>
+    <van-dialog @cancel="show=false"  @confirm="gopaly('/nextOrderDetails',true)" v-model="show" title="距离提示" show-cancel-button>
+   <div style="margin:20px">
+     距离油站距离大于500M，<br/> 是否确认下单
+   </div>
+    </van-dialog>
   </div>
 </template>
 
 <script>
 export default {
-  props:{
-    
-      oilDetails: {
+  props: {
+
+    oilDetails: {
       type: Object,
       default: () => null
     },
   },
-  methods:{
-    gopaly(path){
+  data() {
+    return {
+      show:false,
+      open: 1
+    }
+  },
+  methods: {
+
+    juliFn() {
+      return this.oilDetails.juli > 500?true:false
+    },
+    gopaly(path,open=false) {
+      if(this.juliFn()&&!open){
+        this.show  = true;
+        return
+      }
       this.$router.push({
-        path:path,
-        query:{
+        path: path,
+        query: {
           oilDetails: JSON.stringify(this.oilDetails)
         }
       })
     }
   },
-  created(){},
-  	filters: {
-			distanceFilter(value) {
-				if (value) {
-					return value > 1000 ? ((value / 1000).toFixed(2) + 'km') : (value + 'm')
-				}
-			},
-			usernameF(value) {
-				if (value) {
-					return value.substr(0, 1) + '**'
-				} else {
-					return '匿名'
-				}
-			},
-			plateNumberF(value) {
-				if (value) {
-					return value.substr(0, 2) + '*****'
-				} else {
-					return '车牌号已隐藏'
-				}
-			}
-		}
+  created() {
+    this.open = (() => {
+      let xoil = this.oilDetails.oilSiteChannelDetailsVos.filter((item) => item.channelCode == 'XOIL')[0]
+      return xoil.activePay;
+    })()
+    console.log(this.open)
+  },
+  filters: {
+    distanceFilter(value) {
+      if (value) {
+        return value > 1000 ? ((value / 1000).toFixed(2) + 'km') : (value + 'm')
+      }
+    },
+    usernameF(value) {
+      if (value) {
+        return value.substr(0, 1) + '**'
+      } else {
+        return '匿名'
+      }
+    },
+    plateNumberF(value) {
+      if (value) {
+        return value.substr(0, 2) + '*****'
+      } else {
+        return '车牌号已隐藏'
+      }
+    }
+  }
 }
 </script>
 
 <style scoped>
-.oilEvaluate-container{
+.oilEvaluate-container {
   flex: 1;
   overflow: auto;
 }
+
 .oilEvaluate-footer-butten {
   margin-top: 20px;
   border-radius: 15px;
-  height:90px ;
+  height: 90px;
 }
 
-.oilEvaluate-footer {
-}
+.oilEvaluate-footer {}
 
 .red {
   color: red;
diff --git a/src/views/orderDetails/components/oilGun.vue b/src/views/orderDetails/components/oilGun.vue
index b50098f..a59dd3c 100644
--- a/src/views/orderDetails/components/oilGun.vue
+++ b/src/views/orderDetails/components/oilGun.vue
@@ -4,16 +4,19 @@
             <div class="seleOilGun-title">油枪选择:</div>
             <div class="seleOilGun-container">
                 <div @click="seleGun(index, item)"
-                    :style="{ background: seleIndex == index ? '#FF6700' : '', color: seleIndex == index ? '#FFFFFF' : '', border: seleIndex == index ? '0px' : '' }"
+                    :style="{ background: seleIndex == item ? '#FF6700' : '', color: seleIndex == item ? '#FFFFFF' : '', border: seleIndex == item ? '0px' : '' }"
                     v-for="(item, index) in 9" :key="index" class="seleOilGun-item ac jc">
                     {{ item }}
                 </div>
+                <div :style="{background:seleIndex==0 ? '#FF6700' : '',color:seleIndex==0  ? '#FFFFFF' : '',border: seleIndex==0 ?'0px' : ''}" @click="isShow.keyboard=true;seleIndex=0" class="other-seleOilGun-item  ac jc">
+                    {{seleIndex?'other':otherOilsBar}}
+                </div>
             </div>
         </div>
         <div class="oilGun-information">
             <div @click="isShowFn" class="oilGun-information-item ac">
                 <img src="@/assets/kc.png" alt="" />
-                <span :class=" page.plateNumber ?'cp' : '' " class="oilGun-information-item-text ">
+                <span :class="page.plateNumber ? 'cp' : ''" class="oilGun-information-item-text ">
                     {{ page.plateNumber ? page.plateNumber : '请输入车牌号' }}
                 </span>
                 <van-icon name="arrow" />
@@ -46,7 +49,7 @@
             <div class="flex discount-title">优惠:</div>
             <div class="flex bw top">
                 <span>星油优惠金额</span>
-                <span>{{ page.oilDiscountAmount ? `-￥${page.oilDiscountAmount}` : '---' }}</span>
+                <span>{{ page.oilDiscountAmount ? `-￥${Number(page.oilDiscountAmount).toFixed(2)}` : '---' }}</span>
             </div>
             <div class="flex bw top">
                 <span>优惠券</span>
@@ -55,15 +58,16 @@
         </div>
         <van-popup round closeable :style="{ height: '35%' }" position="bottom" v-model="isShow.licensePlate">
             <div class="license-plate-popup">
-                <div class="license-plate-popup-title">选择车牌号</div>
+                <div class="license-plate-popup-title">请输入车牌号</div>
                 <div class="license-plate-popup-input flex ac">
                     <div class="license-plate-popup-input-lable">
                         <span>车牌号</span>
-                        <input v-model="page.plateNumber" class="license-plate-popup-input-input" type="text">
+                        <input v-model="plateNumber" class="license-plate-popup-input-input" type="text">
                     </div>
                 </div>
             </div>
         </van-popup>
+        <van-number-keyboard @hide="keyboardHide" v-model="otherOilsBar" :show="isShow.keyboard" :maxlength="2" @blur="isShow.keyboard = false" />
     </div>
 </template>
 
@@ -78,7 +82,9 @@ export default {
     },
     data() {
         return {
+            otherOilsBar:'',
             timer: null,
+            plateNumber:'',
             page: {
                 oilDiscountAmount: '',
                 volume: '',
@@ -88,28 +94,51 @@ export default {
             },
             aboutLiters: 0,
             price: '',
-            seleIndex: 0,
+            seleIndex: 1,
             isShow: {
-                licensePlate: false
+                licensePlate: false,
+                keyboard:false
             },
             show: true,
             selePriceIndex: null
         };
     },
     watch: {
+        seleIndex:function(n){
+            if(n!==0){
+                this.otherOilsBar = ''
+            }
+        },
         'seleOil.oilProductCode': {
             handler(n, o) {
-                console.log(n,o,'------------------')
                 if (n !== o) {
                     this.blur()
                 }
             },
             deep: true,
         },
+        'isShow.licensePlate': {
+            handler(n) {
+                if (!n) {
+                    if (this.checkFn('plateNumber', this.plateNumber)) {
+                        this.page.plateNumber = this.plateNumber
+                    } else {
+                        this.$notify('请输入正确车牌号')
+                        this.$nextTick(function () {
+                            this.plateNumber = ''
+                            this.page.plateNumber = ''
+                        })
+                    }
+
+                }
+            },
+            deep: true
+        },
         page: {
             handler() {
                 this.$nextTick(function () {
-                    this.$emit('input', Object.assign(JSON.parse(JSON.stringify(this.seleOil)), this.page));
+                    console.log(this.page.oilsBar,'this.page.oilsBar')
+                    this.$emit('input', Object.assign(JSON.parse(JSON.stringify(this.seleOil)), {...this.page,oilsBar:this.page.oilsBar?this.page.oilsBar:this.otherOilsBar}));
                 })
             },
             deep: true
@@ -118,11 +147,54 @@ export default {
     },
     created() { },
     mounted() {
+        this.plateNumber = this.$pinia.state.value.user.user.plateNumber
+        this.page.plateNumber = this.$pinia.state.value.user.user.plateNumber
         this.$nextTick(function () {
             this.$emit('input', Object.assign(this.seleOil, this.page))
         })
     },
     methods: {
+        keyboardHide(){
+           setTimeout(()=>{
+             if(this.otherOilsBar){
+                this.page = Object.assign({}, { ...this.page, oilsBar: this.otherOilsBar })
+            }else{
+                this.seleIndex= 1
+            }
+           },0)
+        },
+        chenkFn() {
+            let chenk = /^\d+(.\d{1,2})?$/
+            if (!chenk.test(Number(this.price))) {
+                this.$nextTick(function () {
+                    this.price = this.price.slice(0, this.price.length - 1);
+                })
+            } else {
+                if (this.price.indexOf('.') !== -1 && this.price.split('.')[1].length > 2) {
+                    this.$nextTick(function () {
+                        this.price = Number(this.price).toFixed(2);
+                    })
+                }
+            }
+        },
+        checkFn(e, n) {
+            switch (e) {
+                case 'name':
+                    /(^[\u4e00-\u9fa5]{1}[\u4e00-\u9fa5\.·。]{0,18}[\u4e00-\u9fa5]{1}$)|(^[a-zA-Z]{1}[a-zA-Z\s]{0,18}[a-zA-Z]{1}$)/
+                        .test(n);
+                    break
+                case 'plateNumber':
+                    return /(^[\u4E00-\u9FA5]{1}[A-Z0-9]{6}$)|(^[A-Z]{2}[A-Z0-9]{2}[A-Z0-9\u4E00-\u9FA5]{1}[A-Z0-9]{4}$)|(^[\u4E00-\u9FA5]{1}[A-Z0-9]{5}[挂学警军港澳]{1}$)|(^[A-Z]{2}[0-9]{5}$)|(^(08|38){1}[A-Z0-9]{4}[A-Z0-9挂学警军港澳]{1}$)/
+                        .test(n)
+                    break
+                case 'phone':
+                    return /^1[3456789]\d{9}$/.test(n);
+                    break;
+                case 'replacePhone':
+                    /^1[3456789]\d{9}$/.test(n);
+                    break;
+            }
+        },
         resetFn() {
             this.page = Object.assign(
                 {},
@@ -143,11 +215,11 @@ export default {
             }
             oilSiteApi.getOrderDiscountInfo(page).then(res => {
                 let { payRealAmount, oilDiscountAmount, volume } = res.data;
-                this.page = Object.assign(JSON.parse(JSON.stringify(this.page)),{ payRealAmount, oilDiscountAmount, volume });
+                this.page = Object.assign(JSON.parse(JSON.stringify(this.page)), { payRealAmount, oilDiscountAmount, volume });
             })
         },
         seleGun(index, item) {
-            this.seleIndex = index;
+            this.seleIndex = item;
             this.page = Object.assign({}, { ...this.page, oilsBar: item })
         },
         selePrice(index) {
@@ -155,6 +227,7 @@ export default {
             this.blur()
         },
         change() {
+            this.chenkFn()
             if (this.timer) {
                 clearTimeout(this.timer)
             }
@@ -183,6 +256,7 @@ export default {
 .license-plate-popup-input-input {
     border: none !important;
     background-color: #fcfcfc;
+    margin-left: 10px;
 }
 
 .license-plate-popup-input-lable {
@@ -328,6 +402,18 @@ export default {
     padding: 0 30px;
 }
 
+.other-seleOilGun-item {
+    width: 110px;
+    height: 50px;
+    border-radius: 6px 6px 6px 6px;
+    opacity: 1;
+    border: 1px solid #cecece;
+    display: flex;
+    font-size: 28px;
+    color: #333333;
+    box-sizing: border-box;
+}
+
 .seleOilGun-item {
     width: 110px;
     height: 50px;
diff --git a/src/views/orderDetails/components/oilLable.vue b/src/views/orderDetails/components/oilLable.vue
index 8e490fc..d28e462 100644
--- a/src/views/orderDetails/components/oilLable.vue
+++ b/src/views/orderDetails/components/oilLable.vue
@@ -10,7 +10,7 @@
             <div v-for="(itemx, index) in oilType.oilSitePriceDetailsVos" :key="index" class="oilLableDetails-item flex ac">
                 <span class="oilLableDetails-item-tip">惠</span>
                 <span class="oilLableDetails-item-oilNumber">{{ itemx.oilProductCode }}</span>
-                <span class="oilLableDetails-item-oilPrice">￥{{ itemx.sitePrice }}/L</span>
+                <span class="oilLableDetails-item-oilPrice">￥{{ moneyIntercept(itemx.sitePrice)}}/L</span>
                 <span class="oilLableDetails-item-originalPrice">￥{{ itemx.oilSitePrice | moneyIntercept }}/L</span>
                 <span class="oilLableDetails-item-text">预计每100L节省{{ (100 * (itemx.oilSitePrice - itemx.sitePrice)) | moneyFormat}}元</span>
             </div>
diff --git a/src/views/orderDetails/components/oilNextFooter.vue b/src/views/orderDetails/components/oilNextFooter.vue
index 8ae1bb1..3b7f249 100644
--- a/src/views/orderDetails/components/oilNextFooter.vue
+++ b/src/views/orderDetails/components/oilNextFooter.vue
@@ -123,7 +123,18 @@ export default {
     update(e) {
       this.payRealAmount = e
     },
+    positionChenk(position) {
+      return !position?.latitude && !position?.longitude ? true : false
+    },
     gopaly() {
+      let position = this.$pinia.state.value.user.position;
+      if (this.positionChenk(position)) {
+        position = JSON.parse(localStorage.getItem("position"))
+        if (this.positionChenk(position)) {
+          console.log(position, this.$pinia.state.value.user.position, '地理位置错误');
+          return
+        }
+      }
       let page = {
         shareCompanyQuota: 0, // 共享标识
         priceId: this.seleOil.priceId, //类型：String  必有字段  备注：油价主键
@@ -140,18 +151,22 @@ export default {
         // "networkIp": "mock" //类型：String  可有字段  备注：ip地址
         kaliState: 1,
         'version': 1,
-        'xoilAmountGun': Number( Number(this.seleOil.payRealAmount + this.seleOil.oilDiscountAmount).toFixed(2)) ,
-        latitude: 31.82057,
-        longitude: 117.22901
+        'xoilAmountGun': Number(Number(this.seleOil.payRealAmount + this.seleOil.oilDiscountAmount).toFixed(2)),
+        latitude: position.latitude,
+        longitude: position.longitude
+      }
+      if (!page.plateNumber || !page.volume || !page.realPrice) {
+        this.$notify('请检查提交的数据哦')
+        return
       }
       oilOrderApi.createOrder(page).then(res => {
-        if(res.code==20000){
-      this.$router.push({
-         name:'cashier',
-        params:{
-          order:res.data
-        }
-      })
+        if (res.code == 20000) {
+          this.$router.push({
+            'path': '/cashier',
+            query: {
+              order: JSON.stringify(res.data)
+            }
+          })
         }
         console.log(res, '创建订单')
       })
diff --git a/src/views/orderDetails/components/optionalOilLable.vue b/src/views/orderDetails/components/optionalOilLable.vue
index 9da5976..7cbeba0 100644
--- a/src/views/orderDetails/components/optionalOilLable.vue
+++ b/src/views/orderDetails/components/optionalOilLable.vue
@@ -4,17 +4,20 @@
             请提醒加油员使用 <span style="color:red">“星油云站”</span> 进行订单核实
         </div>
         <div class="oilLableDetails">
-            <div @click="seleFn(index)" v-for="(itemx, index) in oilType.oilSitePriceDetailsVos" :key="index" class="oilLableDetails-item flex ac">
+            <div @click="seleFn(index)" v-for="(itemx, index) in oilType.oilSitePriceDetailsVos" :key="index"
+                class="oilLableDetails-item flex ac">
                 <div :class="seleIndex == index ? 'seleLable' : 'label'" class=" flex ac jc">
                     <van-icon size="15" :color="seleIndex == index ? '#FFFFFF' : '#636262'" name="success" />
                 </div>
-              <div style=" overflow: hidden;" class="flex ac">
-                <span class="oilLableDetails-item-tip">惠</span>
-                <span class="oilLableDetails-item-oilNumber">{{ itemx.oilProductCode }}</span>
-                <span class="oilLableDetails-item-oilPrice">￥{{ itemx.sitePrice|moneyIntercept }}/L</span>
-                <span class="oilLableDetails-item-originalPrice">￥{{ itemx.oilSitePrice | moneyIntercept }}/L</span>
-                <span class="oilLableDetails-item-text ">预计每100L节省{{ (100 * (itemx.oilSitePrice - itemx.sitePrice)) | moneyFormat}}元</span>
-              </div>
+                <div style=" overflow: hidden;" class="flex ac">
+                    <span class="oilLableDetails-item-tip">惠</span>
+                    <span class="oilLableDetails-item-oilNumber">{{ itemx.oilProductCode }}</span>
+                    <span class="oilLableDetails-item-oilPrice">￥{{ itemx.sitePrice | moneyIntercept }}/L</span>
+                    <span class="oilLableDetails-item-originalPrice">￥{{ itemx.oilSitePrice | moneyIntercept }}/L</span>
+                    <span class="oilLableDetails-item-text ">预计每100L节省{{ (100 * (itemx.oilSitePrice - itemx.sitePrice))
+                            | moneyFormat
+                    }}元</span>
+                </div>
             </div>
         </div>
     </div>
@@ -23,13 +26,13 @@
 <script>
 export default {
     props: {
-        value:{
-            type:Object,
-            default:null
+        value: {
+            type: Object,
+            default: null
         },
         oilType: {
             type: Object,
-            default: ()=> null
+            default: () => null
         }
     },
     data() {
@@ -37,17 +40,17 @@ export default {
             seleIndex: 0
         }
     },
-    created(){
+    created() {
         this.seleFn(this.seleIndex)
     },
-    methods:{
-        seleFn(index){
+    methods: {
+        seleFn(index) {
             console.log(11)
             this.seleIndex = index;
-            this.$emit('input',Object.assign(Object.assign(JSON.parse(JSON.stringify(this.value)),this.oilType.oilSitePriceDetailsVos[index])))
+            this.$emit('input', Object.assign(Object.assign(JSON.parse(JSON.stringify(this.value)), this.oilType.oilSitePriceDetailsVos[index])))
         },
     },
-        filters: {
+    filters: {
         moneyIntercept(value) {
             if (value != 'xxx.x') {
                 return String(value).split('.')[1] && String(value).split('.')[1].length > 2 ? Number(`${String(value).split('.')[0]}.${String(value).split('.')[1].substring(0, 1)}${Number(String(value).split('.')[1].substring(1, 2)) + 1}`) : Number(value).toFixed(2);
diff --git a/src/views/orderDetails/nextOrderDetails.vue b/src/views/orderDetails/nextOrderDetails.vue
index 5e249df..6832535 100644
--- a/src/views/orderDetails/nextOrderDetails.vue
+++ b/src/views/orderDetails/nextOrderDetails.vue
@@ -37,6 +37,7 @@ export default {
         }
     },
     methods: {
+        	
         update(e) {
             this.$refs.oilNextFooter.update(e)
         },
diff --git a/src/views/orderDetails/orderDetailsIndex.vue b/src/views/orderDetails/orderDetailsIndex.vue
index abba7fa..5a18c3e 100644
--- a/src/views/orderDetails/orderDetailsIndex.vue
+++ b/src/views/orderDetails/orderDetailsIndex.vue
@@ -38,7 +38,7 @@ export default {
     },
     oilTypeFn(){
        let a =  this.oilDetails.oilSiteChannelDetailsVos.filter((item)=> item.channelCode=='XOIL');
-        this.oilType = a.length?a[0]:null;
+       this.oilType = a.length?a[0]:null;
     },
     getDetails(){
       this.oilDetails = JSON.parse(this.$route.query.seleItem)
diff --git a/src/views/personalOrderList/index.vue b/src/views/personalOrderList/index.vue
index 29e7947..676bd07 100644
--- a/src/views/personalOrderList/index.vue
+++ b/src/views/personalOrderList/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="home">
-    <Input-box-search @seach="getList" v-model="page.params.search" ref="homeNavBar" />
+    <Input-box-search @seach="onRefresh" v-model="page.params.search" ref="homeNavBar" />
     <div :style="{}" id="list" class="list">
-      <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-        <van-list @load="onLoad" v-model="loading" :finished="finished" finished-text="没有更多了">
+      <van-pull-refresh   v-model="refreshing" @refresh="onRefresh">
+        <van-list   @load="onLoad" v-model="loading" :finished="finished" finished-text="没有更多了">
           <van-cell v-for="(item, index) in list" :key="index">
             <div style="height: 100%" slot>
               <paymentlListItem @goPlay="goPlay" :listItem="item" />
@@ -58,18 +58,18 @@ export default {
         switch (type) {
           case '待支付':
             this.$router.push({
-              name: 'cashier',
-              params: {
-                order: res.data
+              path: '/cashier',
+              query: {
+                order: JSON.stringify( res.data)
               }
             })
             break;
           default:
             this.$router.push({
-              name: 'paymentl',
-              params: {
-                orderData: res.data,
-                type:type=='支付成功'?true:false
+              path: '/paymentl',
+              query: {
+                orderData:JSON.stringify( res.data),
+                type:type=='已支付'?'true':'false'
               }
             })
             break;
@@ -82,8 +82,11 @@ export default {
       orderApi.getOrderInfoByPage(this.page).then((res) => {
         if (res.data.list.length < 10) {
           this.finished = true
+        }else{
+          this.finished = false
         }
         if (res.code == 20000) {
+          console.log(this.page.currentPage,'+++++++++++++++')
           if (this.page.currentPage == 1) {
             this.list = res.data.list;
           } else {
@@ -91,6 +94,7 @@ export default {
           }
           this.loading = false
           this.refreshing = false;
+          
         }
       }).catch(error => {
         this.finished = true
@@ -100,7 +104,6 @@ export default {
       this.$router.push("/orderDetails");
     },
     onRefresh() {
-      console.log(11)
       this.loading = false;
       this.finished = false;
       this.page.currentPage = 1;
@@ -119,6 +122,8 @@ export default {
     //   };
     // },
     onLoad() {
+      if(this.refreshing) return
+      console.log('loding----------------')
       this.page.currentPage += 1
       this.getList();
     },
diff --git a/vue.config.js b/vue.config.js
index a1378ac..7b5b992 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,9 +1,80 @@
 const { defineConfig } = require('@vue/cli-service');
-const name = '星油能源运营管理平台'
+const path = require('path')
 const port = 9528
+function resolve(dir) {
+  return path.join(__dirname, dir)
+}
 module.exports = defineConfig({
+  publicPath: '/h5/',
+  outputDir: 'dist',
+  assetsDir: './static',
   transpileDependencies: true,
-  lintOnSave:false,
+  lintOnSave: false,
+  configureWebpack: {
+    name: '星油能源',
+    resolve: {
+      alias: {
+        '@': resolve('src') // 别名。开启后@表示src下目录
+      }
+    },
+    externals: {
+      './cptable': 'var cptable',
+      'AMap': 'AMap'
+    }
+  },
+  chainWebpack(config) {
+    config.plugins.delete('preload') // TODO: need test
+    config.plugins.delete('prefetch') // TODO: need test
+    config.entry.app = ['babel-polyfill', './src/main.js']
+    // set svg-sprite-loader
+    config.module.rule('svg').exclude.add(resolve('src/icons')).end()
+    config.module.rule('icons').test(/\.svg$/).include.add(resolve('src/icons')).end().use('svg-sprite-loader').loader('svg-sprite-loader').options({
+      symbolId: 'icon-[name]'
+    }).end()
+
+    if (process.env.use_analyzer) { // 分析
+      config.plugin('webpack-bundle-analyzer').use(require('webpack-bundle-analyzer').BundleAnalyzerPlugin)
+    }
+
+    // set preserveWhitespace
+    config.module.rule('vue').use('vue-loader').loader('vue-loader').tap(options => {
+      options.compilerOptions.preserveWhitespace = true
+      return options
+    }).end()
+
+    config
+    // https://webpack.js.org/configuration/devtool/#development.when(process.env.NODE_ENV === 'development', config => config.devtool('cheap-source-map'))
+
+    config.when(process.env.NODE_ENV !== 'development', config => {
+      config.plugin('ScriptExtHtmlWebpackPlugin').after('html').use('script-ext-html-webpack-plugin', [{ // `runtime` must same as runtimeChunk name. default is `runtime`
+        inline: /runtime\..*\.js$/
+      }]).end()
+      config.optimization.splitChunks({
+        chunks: 'all',
+        cacheGroups: {
+          libs: {
+            name: 'chunk-libs',
+            test: /[\\/]node_modules[\\/]/,
+            priority: 10,
+            chunks: 'initial' // only package third parties that are initially dependent
+          },
+          elementUI: {
+            name: 'chunk-elementUI', // split elementUI into a single package
+            priority: 20, // the weight needs to be larger than libs and app or it will be packaged into libs or app
+            test: /[\\/]node_modules[\\/]_?element-ui(.*)/ // in order to adapt to cnpm
+          },
+          commons: {
+            name: 'chunk-commons',
+            test: resolve('src/components'), // can customize your rules
+            minChunks: 3, // minimum common number
+            priority: 5,
+            reuseExistingChunk: true
+          }
+        }
+      })
+      config.optimization.runtimeChunk('single')
+    })
+  },
   devServer: {
     port: port,
     https: true,