Skip to content

Commit

Permalink
edit:配置
Browse files Browse the repository at this point in the history
  • Loading branch information
Sssitmonkey committed Dec 23, 2020
1 parent 90ec38a commit 29baa83
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 15 deletions.
2 changes: 1 addition & 1 deletion components/shopro-load/shopro-load.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<view class="cu-load load-modal" v-show="loadModal">
<view class="cu-load load-modal" v-if="loadModal">
<image class="load-img" src="/static/imgs//logo/logo.gif" mode="aspectFit"></image>
<view class="locad-text">加载中...</view>
</view>
Expand Down
14 changes: 4 additions & 10 deletions env.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,11 @@
* @version 1.2.0
*/

export const IMG_URL = 'https://shopro.7wpp.com'; //全局网络图片地址变量,css背景图片地址变量在uni.scss
const domain = 'http://dev.7wpp.com'


// #ifdef H5
let protocol = window.location.protocol;
let mDomain = domain.split(':');
// #endif
const ENV_BASE_URL = {
development: protocol === 'https:' ? protocol + mDomain[1] : domain, //开发环境
production: protocol === 'https:' ? protocol + mDomain[1] : domain, //生产环境
development: 'https://dev.7wpp.com', //开发环境
production: 'https://dev.7wpp.com', //生产环境
}

const ENV_API_URL = {
development: `${ENV_BASE_URL.development}/addons/shopro/`, //开发环境
production: `${ENV_BASE_URL.production}/addons/shopro/`, //生产环境
Expand All @@ -24,3 +16,5 @@ const ENV_API_URL = {
export const BASE_URL = ENV_BASE_URL[process.env.NODE_ENV || 'development']; //后台根域名
export const API_URL = ENV_API_URL[process.env.NODE_ENV || 'development']; //后台接口域名
export const HAS_LIVE = false; //后台是否开通直播权限,根据情况在manifest.json中,开启注释相应组件的引入。

export const IMG_URL = 'http://shopro.7wpp.com'; //全局网络图片地址变量,css背景图片地址变量在uni.scss
2 changes: 1 addition & 1 deletion pages/goods/list.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default {
this.listParams.order = e;
this.goodsList = [];
this.listParams.page = 1;
this.getGoodsList();
this.$u.debounce(this.getGoodsList);
},
// 键盘搜索
onSearch() {
Expand Down
2 changes: 1 addition & 1 deletion pages/index/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<view v-else class="page_box shopro-selector">
<!-- 导航栏 -->
<view class="head_box active" :style="{ background: bgcolor }">
<cu-custom :isBack="true" v-if="info && info.name">
<cu-custom :isBack="true" :showBackIcon="false" v-if="info && info.name">
<block slot="backText">
<text class="nav-title shopro-selector-rect">{{ info.name || '商城' }}</text>
</block>
Expand Down
4 changes: 2 additions & 2 deletions static/colorui/components/cu-custom.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<view>
<view class="cu-custom" :style="[{ height: CustomBar + 'px' }]">
<view class="cu-bar fixed" :style="style" :class="[bgImage != '' ? 'none-bg text-white bg-img' : '', bgColor]">
<view class="action" @tap="BackPage" v-if="isBack">
<text class="cuIcon-back cu-back" v-if="showBackIcon"></text>
<view class="action" v-if="isBack">
<text class="cuIcon-back cu-back" @tap="BackPage" v-if="showBackIcon"></text>
<slot name="backText"></slot>
</view>
<view class="content" :style="[{ top: StatusBar + 'px' }]"><slot name="content"></slot></view>
Expand Down

0 comments on commit 29baa83

Please sign in to comment.