页面修改
This commit is contained in:
parent
99ef4d1da6
commit
8deeb65dc8
@ -24,8 +24,8 @@ if (process.env.NODE_ENV === "development") {
|
|||||||
// httpApiThree = 'baseUrlTest' // h5跨域配置
|
// httpApiThree = 'baseUrlTest' // h5跨域配置
|
||||||
// #endif
|
// #endif
|
||||||
} else if (process.env.NODE_ENV === 'production') {
|
} else if (process.env.NODE_ENV === 'production') {
|
||||||
httpApi = 'https://shop.lihaink.cn' // 生产
|
// httpApi = 'https://shop.lihaink.cn' // 生产
|
||||||
// httpApi = "https://crmeb-test.shop.lihaink.cn"
|
httpApi = "https://crmeb-test.shop.lihaink.cn"
|
||||||
httpApiTwo = 'https://nk.lihaink.cn' // 生产
|
httpApiTwo = 'https://nk.lihaink.cn' // 生产
|
||||||
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
|
httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
|
||||||
}
|
}
|
||||||
|
81
main.js
81
main.js
@ -12,7 +12,9 @@ import App from './App'
|
|||||||
import store from './store'
|
import store from './store'
|
||||||
import Cache from './utils/cache'
|
import Cache from './utils/cache'
|
||||||
import util from 'utils/util'
|
import util from 'utils/util'
|
||||||
import { HTTP_REQUEST_URL } from '@/config/app';
|
import {
|
||||||
|
HTTP_REQUEST_URL
|
||||||
|
} from '@/config/app';
|
||||||
import skeleton from './components/skeleton/index.vue'
|
import skeleton from './components/skeleton/index.vue'
|
||||||
import BaseMoney from './components/BaseMoney.vue';
|
import BaseMoney from './components/BaseMoney.vue';
|
||||||
import uView from '@/uni_modules/uview-ui'
|
import uView from '@/uni_modules/uview-ui'
|
||||||
@ -23,59 +25,63 @@ Vue.prototype.$util = util;
|
|||||||
Vue.prototype.$Cache = Cache;
|
Vue.prototype.$Cache = Cache;
|
||||||
Vue.prototype.$eventHub = new Vue();
|
Vue.prototype.$eventHub = new Vue();
|
||||||
Vue.config.productionTip = false
|
Vue.config.productionTip = false
|
||||||
Vue.prototype.$bus = new Vue();
|
Vue.prototype.$bus = new Vue();
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
import { parseQuery } from "./utils";
|
import {
|
||||||
|
parseQuery
|
||||||
|
} from "./utils";
|
||||||
import Auth from './libs/wechat';
|
import Auth from './libs/wechat';
|
||||||
import { SPREAD } from './config/cache';
|
import {
|
||||||
|
SPREAD
|
||||||
|
} from './config/cache';
|
||||||
// import wx from '@/node_modules/jweixin-module/lib/index'
|
// import wx from '@/node_modules/jweixin-module/lib/index'
|
||||||
var __s = document.createElement('script');
|
var __s = document.createElement('script');
|
||||||
__s.src = HTTP_REQUEST_URL + "/api/script";
|
__s.src = HTTP_REQUEST_URL + "/api/script";
|
||||||
document.head.appendChild(__s);
|
document.head.appendChild(__s);
|
||||||
Vue.prototype.$wechat = Auth;
|
Vue.prototype.$wechat = Auth;
|
||||||
let cookieName = "VCONSOLE",
|
let cookieName = "VCONSOLE",
|
||||||
query = parseQuery(),
|
query = parseQuery(),
|
||||||
urlSpread = query["spread"],
|
urlSpread = query["spread"],
|
||||||
vconsole = query[cookieName.toLowerCase()],
|
vconsole = query[cookieName.toLowerCase()],
|
||||||
md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
|
md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
|
||||||
md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
|
md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
|
||||||
|
|
||||||
if (urlSpread !== undefined) {
|
if (urlSpread !== undefined) {
|
||||||
var spread = Cache.get(SPREAD);
|
var spread = Cache.get(SPREAD);
|
||||||
urlSpread = parseInt(urlSpread);
|
urlSpread = parseInt(urlSpread);
|
||||||
if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
|
if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
|
||||||
Cache.set("spread", urlSpread || 0);
|
Cache.set("spread", urlSpread || 0);
|
||||||
} else if (spread === 0 || typeof spread !== "number") {
|
} else if (spread === 0 || typeof spread !== "number") {
|
||||||
Cache.set("spread", urlSpread || 0);
|
Cache.set("spread", urlSpread || 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (vconsole !== undefined) {
|
if (vconsole !== undefined) {
|
||||||
if (vconsole === md5UnCrmeb && Cache.has(cookieName))
|
if (vconsole === md5UnCrmeb && Cache.has(cookieName))
|
||||||
Cache.clear(cookieName);
|
Cache.clear(cookieName);
|
||||||
} else vconsole = Cache.get(cookieName);
|
} else vconsole = Cache.get(cookieName);
|
||||||
|
|
||||||
import VConsole from './components/vconsole.min.js'
|
import VConsole from './components/vconsole.min.js'
|
||||||
|
|
||||||
if (vconsole !== undefined && vconsole === md5Crmeb) {
|
if (vconsole !== undefined && vconsole === md5Crmeb) {
|
||||||
Cache.set(cookieName, md5Crmeb, 3600);
|
Cache.set(cookieName, md5Crmeb, 3600);
|
||||||
let vConsole = new VConsole();
|
let vConsole = new VConsole();
|
||||||
|
|
||||||
}
|
}
|
||||||
// 注册全局防抖指令
|
// 注册全局防抖指令
|
||||||
Vue.directive('debounce', {
|
Vue.directive('debounce', {
|
||||||
inserted: (el, binding) => {
|
inserted: (el, binding) => {
|
||||||
let debounceTime = binding.value || 2000
|
let debounceTime = binding.value || 2000
|
||||||
let timer
|
let timer
|
||||||
el.addEventListener('click', e => {
|
el.addEventListener('click', e => {
|
||||||
el.style.pointerEvents = 'none';
|
el.style.pointerEvents = 'none';
|
||||||
if (!el.disabled) {
|
if (!el.disabled) {
|
||||||
timer = setTimeout(() => {
|
timer = setTimeout(() => {
|
||||||
el.style.pointerEvents = 'auto'
|
el.style.pointerEvents = 'auto'
|
||||||
}, debounceTime)
|
}, debounceTime)
|
||||||
}
|
}
|
||||||
}, true)
|
}, true)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// if(!!!Auth.isAndroid() && Auth.isWeixin()){
|
// if(!!!Auth.isAndroid() && Auth.isWeixin()){
|
||||||
@ -86,12 +92,17 @@ Vue.directive('debounce', {
|
|||||||
|
|
||||||
// #endif
|
// #endif
|
||||||
|
|
||||||
|
let appInfo = uni.getSystemInfo().then(res => {
|
||||||
|
Vue.prototype.$appInfo = res[1];
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
App.mpType = 'app'
|
App.mpType = 'app'
|
||||||
|
|
||||||
|
|
||||||
const app = new Vue({
|
const app = new Vue({
|
||||||
...App,
|
...App,
|
||||||
store,
|
store,
|
||||||
Cache
|
Cache
|
||||||
})
|
})
|
||||||
app.$mount();
|
app.$mount();
|
@ -260,6 +260,7 @@
|
|||||||
"path": "cloud_entrepot/index",
|
"path": "cloud_entrepot/index",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationStyle": "custom",
|
"navigationStyle": "custom",
|
||||||
|
"navigationBarTitleText": "里海云仓",
|
||||||
"enablePullDownRefresh": true
|
"enablePullDownRefresh": true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -86,12 +86,15 @@
|
|||||||
height="998.83rpx"></u--image> -->
|
height="998.83rpx"></u--image> -->
|
||||||
<view class="menu" style="z-index: 999;" v-if="showtit">
|
<view class="menu" style="z-index: 999;" v-if="showtit">
|
||||||
<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper"
|
<swiper :autoplay="false" :active-class="activeClass" :interval="3000" class="swiper"
|
||||||
:circular="true" previous-margin='280rpx' next-margin='280rpx' :current="current"
|
:circular="true" previous-margin='270rpx' next-margin='270rpx' :current="current"
|
||||||
@change="test">
|
@change="test">
|
||||||
<!-- :class="{active_swiper:index==current}" -->
|
<!-- :class="{active_swiper:index==current}" -->
|
||||||
<swiper-item v-for="(item,index) in cloudList" :key="index">
|
<swiper-item v-for="(item,index) in cloudList" :key="index">
|
||||||
<u--image :showLoading="true" :src="item.background" width="175.23rpx"
|
<view class="swiper_item" :class="{swiper_item_act:index==current}">
|
||||||
height="175.23rpx"></u--image>
|
<u--image :showLoading="true" :src="item.background" class="swiper_b"
|
||||||
|
width="175.23rpx" height="175.23rpx"></u--image>
|
||||||
|
</view>
|
||||||
|
|
||||||
</swiper-item>
|
</swiper-item>
|
||||||
</swiper>
|
</swiper>
|
||||||
</view>
|
</view>
|
||||||
@ -230,12 +233,8 @@
|
|||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
|
<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
|
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
@ -312,15 +311,12 @@
|
|||||||
},
|
},
|
||||||
onLoad(e) {
|
onLoad(e) {
|
||||||
this.cartFn()
|
this.cartFn()
|
||||||
uni.getSystemInfo({
|
this.appInfo = this.$appInfo.safeAreaInsets
|
||||||
success: (res) => {
|
this.winHeight = this.$appInfo.windowHeight
|
||||||
this.winHeight = res.windowHeight
|
|
||||||
this.appInfo = res.safeAreaInsets
|
|
||||||
},
|
|
||||||
});
|
|
||||||
this.street_code = e.street
|
this.street_code = e.street
|
||||||
this.town = e.town
|
this.town = e.town
|
||||||
this.getCloundShop()
|
this.getCloundShop()
|
||||||
|
// console.log(this.appInfo, "手机信息")
|
||||||
},
|
},
|
||||||
// 分页
|
// 分页
|
||||||
// onReachBottom() {
|
// onReachBottom() {
|
||||||
@ -551,6 +547,33 @@
|
|||||||
z-index: 99999999;
|
z-index: 99999999;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.swiper_item {
|
||||||
|
display: flex;
|
||||||
|
justify-content: space-around;
|
||||||
|
transition: .5s;
|
||||||
|
padding: 40rpx;
|
||||||
|
// transform: scale(1.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
.swiper_item_act {
|
||||||
|
transform: scale(1.2);
|
||||||
|
}
|
||||||
|
|
||||||
|
// .swiper_item:hover {}
|
||||||
|
|
||||||
|
|
||||||
|
// .swiper_item {
|
||||||
|
// transform: scale(1.2);
|
||||||
|
// }
|
||||||
|
|
||||||
|
.swiper_b {
|
||||||
|
transition: 1s;
|
||||||
|
}
|
||||||
|
|
||||||
|
// .swiper_b:active {
|
||||||
|
// transform: scale(1.5);
|
||||||
|
// }
|
||||||
|
|
||||||
.act_cart {
|
.act_cart {
|
||||||
transition: 0.5s;
|
transition: 0.5s;
|
||||||
transform: scale(1.1);
|
transform: scale(1.1);
|
||||||
|
@ -113,8 +113,8 @@
|
|||||||
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
|
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class='footer acea-row row-between-wrapper' :class="isFooter?'':'on'"
|
<view class='footer acea-row row-between-wrapper' :style="`bottom:${appInfo.bottom+40}px`"
|
||||||
v-if="cartList.valid.length > 0">
|
:class="isFooter?'':'on'" v-if="cartList.valid.length > 0">
|
||||||
<view>
|
<view>
|
||||||
<view class="allcheckbox" @click.stop="checkboxAllChange">
|
<view class="allcheckbox" @click.stop="checkboxAllChange">
|
||||||
<text v-if="!isAllSelect" class="iconfont icon-weixuanzhong"></text>
|
<text v-if="!isAllSelect" class="iconfont icon-weixuanzhong"></text>
|
||||||
@ -215,6 +215,7 @@
|
|||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
|
appInfo: null,
|
||||||
loading: false, //是否加载中
|
loading: false, //是否加载中
|
||||||
loadend: false, //是否加载完毕
|
loadend: false, //是否加载完毕
|
||||||
loadTitle: '加载更多', //提示语
|
loadTitle: '加载更多', //提示语
|
||||||
@ -274,6 +275,7 @@
|
|||||||
|
|
||||||
},
|
},
|
||||||
onShow: function() {
|
onShow: function() {
|
||||||
|
this.appInfo = this.$appInfo.safeAreaInsets
|
||||||
let that = this
|
let that = this
|
||||||
let routes = getCurrentPages();
|
let routes = getCurrentPages();
|
||||||
let curRoute = routes[routes.length - 1].route
|
let curRoute = routes[routes.length - 1].route
|
||||||
|
Loading…
x
Reference in New Issue
Block a user