@@ -1,5 +1,5 @@
NODE_ENV=production
VUE_APP_PREVIEW=false
-VUE_APP_API_BASE_URL=https://it.zyucgj.com/zyit/
+VUE_APP_API_BASE_URL=http://carwash.zyucgj.com/cw-admin/
VUE_APP_VERSION=V1.0.1
-VUE_APP_PRO_NAME=洗车机运营后台
+VUE_APP_PRO_NAME=洗车机运营管理平台
@@ -2,4 +2,4 @@ NODE_ENV=development
VUE_APP_PREVIEW=true
VUE_APP_API_BASE_URL=/api
-VUE_APP_PRO_NAME=洗车机运营后台-dev
+VUE_APP_PRO_NAME=洗车机运营管理平台-dev
-VUE_APP_API_BASE_URL=http://it.test.zyucgj.com/zyit
+VUE_APP_API_BASE_URL=http://carwash.test.zyucgj.com/cw-admin/
-VUE_APP_PRO_NAME=洗车机运营后台-pro
+VUE_APP_PRO_NAME=洗车机运营管理平台-pro
@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>logo.png">
- <title>洗车机运营后台</title>
+ <title>洗车机运营管理平台</title>
<style>#loading-mask{position:fixed;left:0;top:0;height:100%;width:100%;background:#fff;user-select:none;z-index:9999;overflow:hidden}.loading-wrapper{position:absolute;top:50%;left:50%;transform:translate(-50%,-100%)}.loading-dot{animation:antRotate 1.2s infinite linear;transform:rotate(45deg);position:relative;display:inline-block;font-size:64px;width:64px;height:64px;box-sizing:border-box}.loading-dot i{width:22px;height:22px;position:absolute;display:block;background-color:#1890ff;border-radius:100%;transform:scale(.75);transform-origin:50% 50%;opacity:.3;animation:antSpinMove 1s infinite linear alternate}.loading-dot i:nth-child(1){top:0;left:0}.loading-dot i:nth-child(2){top:0;right:0;-webkit-animation-delay:.4s;animation-delay:.4s}.loading-dot i:nth-child(3){right:0;bottom:0;-webkit-animation-delay:.8s;animation-delay:.8s}.loading-dot i:nth-child(4){bottom:0;left:0;-webkit-animation-delay:1.2s;animation-delay:1.2s}@keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@-webkit-keyframes antRotate{to{-webkit-transform:rotate(405deg);transform:rotate(405deg)}}@keyframes antSpinMove{to{opacity:1}}@-webkit-keyframes antSpinMove{to{opacity:1}}</style>
<!-- require cdn assets css -->
<% for (var i in htmlWebpackPlugin.options.cdn && htmlWebpackPlugin.options.cdn.css) { %>
@@ -1,5 +1,6 @@
<template>
<div class="upload-file" :style="{width: maxNums>1?'100%':'auto'}">
+ <!-- previewFile 暂时去掉,否则不能正常回显 -->
<a-upload
:action="action"
:listType="listType"
@@ -7,7 +8,6 @@
@preview="handlePreview"
@change="handleChange"
:beforeUpload="beforeUpload"
- :preview-file="previewFile"
:data="params"
:value="comVal"
>
@@ -407,7 +407,7 @@ body {
h1 {
color: #fff;
- font-size: 20px;
+ font-size: 16px;
margin: 0 0 0 12px;
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
font-weight: 600;
@@ -44,7 +44,7 @@ const user = {
if (res.userid) {
Vue.ls.set('hasError', 0)
commit('SET_TOKEN', res.userid)
- commit('SET_NAME', { name: res.username, welcome: welcome() })
+ commit('SET_NAME', { name: res.userNameCN, welcome: welcome() })
commit('SET_AVATAR', res.avatar ? res.avatar : '')
Vue.ls.set('rolesAccess', { permissionList: res.permCodes }, 7 * 24 * 60 * 60 * 1000)
// 记住密码
@@ -16,4 +16,4 @@ export const setDocumentTitle = function (title) {
}
-export const domTitle = '洗车机运营后台'
+export const domTitle = '洗车机运营管理平台'
@@ -308,7 +308,6 @@
// 表单赋值
setVal(item){
const _this = this
- console.log(item)
let arr = [ 'id', 'icon', 'name', 'addrProvince', 'addrProvinceName', 'addrCityName', 'addrDistrictName', 'featuredServiceLabel', 'lng', 'lat', 'serviceType', 'guidance', 'reminder' ]
arr.map(k => {
this.form[k] = item[k]
@@ -326,7 +325,6 @@
this.form.endTime = moment(item.endTime, 'HH:mm') // 营业时间 结束时间
this.setPeriodPrice(item.storeItemPriceDTOList) // 时段价格
this.isShow ? this.$refs.editor.setHtml(item.guidance) : null // 文本编辑器赋值
- console.log(this.form,'----赋值后的表单')
},
// 时段价格 赋值处理
setPeriodPrice(storeItemPriceDTOList){
@@ -214,7 +214,7 @@
this.isQrCodeModal = true
}else{
this.qrCode = ''
- this.$message.success(res.message)
+ this.$message.error(res.message)
})
@@ -62,7 +62,7 @@
</a-col>
<a-col :span="24" class="item-cont">
<p class="item-label">路段指引:</p>
- <p class="item-main guidance-con" v-html="carWashInfo.guidance"></p>
+ <p :class="['item-main', carWashInfo.guidance ? 'guidance-con' : '']" v-html="carWashInfo.guidance"></p>
<p class="item-label">温馨提示:</p>
@@ -127,7 +127,6 @@
if(result.status == 200){
this.carWashInfo = Object.assign(res.data, {storeItemPriceDTOList: result.data})
// 获取当前设备图片
- console.log(res.data)
deviceImage({ deviceNo: res.data.deviceVOList[0].deviceNo }).then(results => {
if(results.status == 200){
this.pic = results.data
@@ -108,8 +108,8 @@ const vueConfig = {
// If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
proxy: {
'/api': {
- target: 'http://192.168.16.102:8101/cw-admin/',
- // target: 'https://zyyc.chelingzhu.com/cw-admin/',
+ // target: 'http://192.168.16.102:8101/cw-admin/',
+ target: 'http://carwash.test.zyucgj.com/cw-admin/',
ws: false,
changeOrigin: true,
pathRewrite: {