diff --git a/main.js b/main.js
index 304c9fe..c99b17d 100644
--- a/main.js
+++ b/main.js
@@ -12,7 +12,9 @@ import App from './App'
import store from './store'
import Cache from './utils/cache'
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 BaseMoney from './components/BaseMoney.vue';
import uView from '@/uni_modules/uview-ui'
@@ -23,59 +25,63 @@ Vue.prototype.$util = util;
Vue.prototype.$Cache = Cache;
Vue.prototype.$eventHub = new Vue();
Vue.config.productionTip = false
-Vue.prototype.$bus = new Vue();
+Vue.prototype.$bus = new Vue();
// #ifdef H5
-import { parseQuery } from "./utils";
+import {
+ parseQuery
+} from "./utils";
import Auth from './libs/wechat';
-import { SPREAD } from './config/cache';
+import {
+ SPREAD
+} from './config/cache';
// import wx from '@/node_modules/jweixin-module/lib/index'
var __s = document.createElement('script');
__s.src = HTTP_REQUEST_URL + "/api/script";
document.head.appendChild(__s);
Vue.prototype.$wechat = Auth;
let cookieName = "VCONSOLE",
- query = parseQuery(),
- urlSpread = query["spread"],
- vconsole = query[cookieName.toLowerCase()],
- md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
- md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
+ query = parseQuery(),
+ urlSpread = query["spread"],
+ vconsole = query[cookieName.toLowerCase()],
+ md5Crmeb = "b14d1e9baeced9bb7525ab19ee35f2d2", //CRMEB MD5 加密开启vconsole模式
+ md5UnCrmeb = "3dca2162c4e101b7656793a1af20295c"; //UN_CREMB MD5 加密关闭vconsole模式
if (urlSpread !== undefined) {
- var spread = Cache.get(SPREAD);
- urlSpread = parseInt(urlSpread);
- if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
- Cache.set("spread", urlSpread || 0);
- } else if (spread === 0 || typeof spread !== "number") {
- Cache.set("spread", urlSpread || 0);
- }
+ var spread = Cache.get(SPREAD);
+ urlSpread = parseInt(urlSpread);
+ if (!Number.isNaN(urlSpread) && spread !== urlSpread) {
+ Cache.set("spread", urlSpread || 0);
+ } else if (spread === 0 || typeof spread !== "number") {
+ Cache.set("spread", urlSpread || 0);
+ }
}
if (vconsole !== undefined) {
- if (vconsole === md5UnCrmeb && Cache.has(cookieName))
- Cache.clear(cookieName);
+ if (vconsole === md5UnCrmeb && Cache.has(cookieName))
+ Cache.clear(cookieName);
} else vconsole = Cache.get(cookieName);
import VConsole from './components/vconsole.min.js'
if (vconsole !== undefined && vconsole === md5Crmeb) {
- Cache.set(cookieName, md5Crmeb, 3600);
- let vConsole = new VConsole();
+ Cache.set(cookieName, md5Crmeb, 3600);
+ let vConsole = new VConsole();
}
// 注册全局防抖指令
Vue.directive('debounce', {
- inserted: (el, binding) => {
- let debounceTime = binding.value || 2000
- let timer
- el.addEventListener('click', e => {
- el.style.pointerEvents = 'none';
- if (!el.disabled) {
- timer = setTimeout(() => {
- el.style.pointerEvents = 'auto'
- }, debounceTime)
- }
- }, true)
- }
+ inserted: (el, binding) => {
+ let debounceTime = binding.value || 2000
+ let timer
+ el.addEventListener('click', e => {
+ el.style.pointerEvents = 'none';
+ if (!el.disabled) {
+ timer = setTimeout(() => {
+ el.style.pointerEvents = 'auto'
+ }, debounceTime)
+ }
+ }, true)
+ }
})
// if(!!!Auth.isAndroid() && Auth.isWeixin()){
@@ -86,12 +92,17 @@ Vue.directive('debounce', {
// #endif
+let appInfo = uni.getSystemInfo().then(res => {
+ Vue.prototype.$appInfo = res[1];
+});
+
+
App.mpType = 'app'
const app = new Vue({
- ...App,
- store,
- Cache
+ ...App,
+ store,
+ Cache
})
app.$mount();
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 19b254a..36b9f80 100644
--- a/pages.json
+++ b/pages.json
@@ -305,6 +305,7 @@
"path": "cloud_entrepot/index",
"style": {
"navigationStyle": "custom",
+ "navigationBarTitleText": "里海云仓",
"enablePullDownRefresh": true
}
diff --git a/pages/nongKe/cloud_entrepot/index.vue b/pages/nongKe/cloud_entrepot/index.vue
index 1d3f8ae..a04503e 100644
--- a/pages/nongKe/cloud_entrepot/index.vue
+++ b/pages/nongKe/cloud_entrepot/index.vue
@@ -86,15 +86,19 @@
height="998.83rpx"> -->
-
+
@@ -150,7 +154,7 @@
-
+
@@ -159,7 +163,7 @@
-
+
@@ -194,7 +198,6 @@
-
-
-
-
-
@@ -312,15 +311,12 @@
},
onLoad(e) {
this.cartFn()
- uni.getSystemInfo({
- success: (res) => {
- this.winHeight = res.windowHeight
- this.appInfo = res.safeAreaInsets
- },
- });
+ this.appInfo = this.$appInfo.safeAreaInsets
+ this.winHeight = this.$appInfo.windowHeight
this.street_code = e.street
this.town = e.town
this.getCloundShop()
+ // console.log(this.appInfo, "手机信息")
},
// 分页
// onReachBottom() {
@@ -381,6 +377,7 @@
uni.stopPullDownRefresh()
this.getCloundShop()
this.getList()
+ this.cartFn()
},
// onReachBottom() {
// console.log("daidi")
@@ -389,9 +386,16 @@
methods: {
cartFn() {
getCartList().then(res => {
+ console.log(res)
+ this.totalMoney = 0
this.cartList = res.data.list
- this.cartList[0].list.forEach(e => {
- this.totalMoney = this.totalMoney + Number(e.productAttr.price) * e.cart_num
+ this.cartList.forEach(e => {
+ this.totalMoney += e.list[0].cart_num * e.list[0].productAttr.price
+ // console.log(e.list[0].cart_num, e.list[0].productAttr.price)
+ // return
+ // console.log(e.list[0].cart_num, e.productAttr[0].price)
+ // this.totalMoney = this.totalMoney + Number(e.productAttr.price) * e.cart_num
+ // console.log(e.productAttr.price, e.cart_num)
})
})
getCartCounts().then(res => {
@@ -543,6 +547,33 @@
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 {
transition: 0.5s;
transform: scale(1.1);
diff --git a/pages/nongKe/cloud_entrepot/indexa.vue b/pages/nongKe/cloud_entrepot/indexa.vue
new file mode 100644
index 0000000..7b9facc
--- /dev/null
+++ b/pages/nongKe/cloud_entrepot/indexa.vue
@@ -0,0 +1,1020 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{a}}
+
+
+
+
+ 全部
+
+
+
+
+
+
+
+
+
+
+
+
+ 供销综合云市场
+
+
+
+
+
+
+
+
+
+ 全部
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.tit}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.store_info}}
+
+
+
+ {{item.rate}}
+ {{item.reply_count}}评论
+
+
+
+
+ ￥{{item.price}}
+
+
+ ￥30.00
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{goodsNum}}
+
+
+
+
+ ￥{{totalMoney}}
+
+
+ 支持配送 售后无忧
+
+
+
+
+ 去结算
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 里海云仓
+
+
+
+
+
+
+
+ {{item.category_name}}云仓服务
+
+
+ {{item.description}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/order_addcart/order_addcart.vue b/pages/order_addcart/order_addcart.vue
index d04eb0f..2c6f8b5 100644
--- a/pages/order_addcart/order_addcart.vue
+++ b/pages/order_addcart/order_addcart.vue
@@ -113,8 +113,8 @@
{{loadTitle}}
-