mkm/nk-shop2.0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/old/zmj' into old

Browse Source
This commit is contained in:
jia 2023-09-12 11:44:14 +08:00
commit 7db2da2678
5 changed files with 1125 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
main.js
View File

@ -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'
@ -25,57 +27,61 @@ Vue.prototype.$eventHub = new Vue();
Vue.config.productionTip = false
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();

1
pages.json
View File

@ -305,6 +305,7 @@
"path": "cloud_entrepot/index",
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "里海云仓",
"enablePullDownRefresh": true
}

71
pages/nongKe/cloud_entrepot/index.vue
View File

@ -86,15 +86,19 @@
height="998.83rpx"></u--image> -->
<view class="menu" style="z-index: 999;" v-if="showtit">
<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">
<swiper-item v-for="(item,index) in cloudList" :class="{active_swiper:index==current}">
<u--image :showLoading="true" :src="item.background" width="175.23rpx"
height="175.23rpx"></u--image>
<!-- :class="{active_swiper:index==current}" -->
<swiper-item v-for="(item,index) in cloudList" :key="index">
<view class="swiper_item" :class="{swiper_item_act:index==current}">
<u--image :showLoading="true" :src="item.background" class="swiper_b"
width="175.23rpx" height="175.23rpx"></u--image>
</view>
</swiper-item>
</swiper>
</view>
<!-- 商品列表 -->
<transition name="fade">
<view class="content">
<view class="content_sift" :style="{position:pocls,top:(headtop+16)+'px'}" v-if="!showtit">
@ -150,7 +154,7 @@
<!-- <u-loadmore :status="status" /> -->
</view>
</view>
<!-- 空 -->
<view v-else>
<view class="empty">
<view class="info">
@ -159,7 +163,7 @@
</view>
</view>
</view>
<!-- 购物车 -->
<view class="card" :style="`bottom:${appInfo.bottom}px`"
@click="navgo('/pages/order_addcart/order_addcart')">
<view class="left">
@ -194,7 +198,6 @@
<!-- 组件 -->
<view<u-popup mode="right" :show="showPop" @close="showPop=false" @open="showPop=true">
<view class="pop">
<!-- <text>出淤泥而不染，濯清涟而不妖</text> -->
<view style="height: var(--status-bar-height);"></view>
<view class="pop_head" style="display: flex;">
<u--image :showLoading="true" src="/static/images/LHYC/PFH.png" width="50.82rpx"
@ -230,12 +233,8 @@
</view>
<view class="" :style="`height:${appInfo.bottom}px;background-color:white`">
</view>
</view>
</view>
</template>
@ -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);

1020
pages/nongKe/cloud_entrepot/indexa.vue Normal file
View File

File diff suppressed because it is too large Load Diff

12
pages/order_addcart/order_addcart.vue
View File

@ -113,8 +113,8 @@
<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
</view>
</view>
<view class='footer acea-row row-between-wrapper' :class="isFooter?'':'on'"
v-if="cartList.valid.length > 0">
<view class='footer acea-row row-between-wrapper' :style="`bottom:${appInfo.bottom+40}px`"
:class="isFooter?'':'on'" v-if="cartList.valid.length > 0">
<view>
<view class="allcheckbox" @click.stop="checkboxAllChange">
<text v-if="!isAllSelect" class="iconfont icon-weixuanzhong"></text>
@ -215,6 +215,7 @@
},
data() {
return {
appInfo: null,
loading: false, //是否加载中
loadend: false, //是否加载完毕
loadTitle: '加载更多', //提示语
@ -274,6 +275,7 @@
},
onShow: function() {
this.appInfo = this.$appInfo.safeAreaInsets
let that = this
let routes = getCurrentPages();
let curRoute = routes[routes.length - 1].route
@ -1218,9 +1220,9 @@
padding: 0 30rpx;
box-sizing: border-box;
border-top: 1px solid #eee;
bottom: 98rpx;
bottom: calc(98rpx + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
bottom: 40px;
bottom: calc(40px + constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/
bottom: calc(40px + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/
}
.shoppingCart .footer.on {