Skip to content

梁建民 / h5

Go to a project
Commit 4993a68b by 肖康
Options

Merge branch 'master' of http://119.23.72.7/liangjianmin/h5 

# Conflicts:
#	view/0.js
#	view/1.js
#	view/10.js
#	view/11.js
#	view/12.js
#	view/13.js
#	view/14.js
#	view/15.js
#	view/16.js
#	view/17.js
#	view/18.js
#	view/19.js
#	view/2.js
#	view/20.js
#	view/21.js
#	view/22.js
#	view/23.js
#	view/24.js
#	view/25.js
#	view/26.js
#	view/27.js
#	view/28.js
#	view/29.js
#	view/3.js
#	view/30.js
#	view/31.js
#	view/32.js
#	view/33.js
#	view/34.js
#	view/35.js
#	view/36.js
#	view/37.js
#	view/38.js
#	view/39.js
#	view/4.js
#	view/40.js
#	view/41.js
#	view/42.js
#	view/43.js
#	view/44.js
#	view/45.js
#	view/46.js
#	view/47.js
#	view/48.js
#	view/49.js
#	view/5.js
#	view/50.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js
#	view/index.html
parents 77e3c481 df24ba5c
Expand all
Inline Side-by-side
Showing with 31 additions and 24 deletions
src/api/index.js
......@@ -36,10 +36,10 @@ switch (window.location.hostname) {
break;
case "m.liexin.com":
url = 'http://m.liexin.com/v3/';
urlApi = 'http://api.liexin.com/';
urlApi = 'http://api.liexin.com/';
urlPc = 'http://www.liexin.com/v3/';
zyApi = 'http://soso12.ichunt.com';
lyApi = 'http://soso12.ichunt.com';
lyApi = 'http://soso12.ichunt.com';
break;
default:
//本地proxy配置参考vue.config.js
......
src/views/car/car.vue
......@@ -72,11 +72,11 @@
<div class="mui-col-sm-5 mui-col-xs-5">
<div class="clr add-num">
<div class="mui-numbox edit-input">
<button class="mui-btn mui-btn-numbox-minus " type="button" @click="changeNumber(item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,1)">
<button class="mui-btn mui-btn-numbox-minus " type="button" @click="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,1)">
<i class="icon iconfont icon-jian"></i>
</button>
<input class="mui-input-numbox valuep" type="number" :id="'test'+item.cart_id" @blur="changeNumber(item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,3)" :value="item.goods_number | numberCode">
<button class="mui-btn mui-btn-numbox-plus " type="button" @click="changeNumber(item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,2)">
<input class="mui-input-numbox valuep" type="number" :id="'test'+item.cart_id" @blur="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,3)" :value="item.goods_number | numberCode">
<button class="mui-btn mui-btn-numbox-plus " type="button" @click="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,2)">
<i class="icon iconfont icon-jia"></i>
</button>
</div>
......@@ -182,11 +182,11 @@
<div class="mui-col-sm-5 mui-col-xs-5">
<div class="clr add-num">
<div class="mui-numbox edit-input">
<button class="mui-btn mui-btn-numbox-minus " type="button" @click="changeNumber(item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,1)">
<button class="mui-btn mui-btn-numbox-minus " type="button" @click="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,1)">
<i class="icon iconfont icon-jian"></i>
</button>
<input class="mui-input-numbox valuep" type="number" :id="'test'+item.cart_id" @blur="changeNumber(item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,3)" :value="item.goods_number | numberCode">
<button class="mui-btn mui-btn-numbox-plus " type="button" @click="changeNumber(item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,2)">
<input class="mui-input-numbox valuep" type="number" :id="'test'+item.cart_id" @blur="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,3)" :value="item.goods_number | numberCode">
<button class="mui-btn mui-btn-numbox-plus " type="button" @click="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.multiple,item.min_buy,item.stock,item.cart_id,2)">
<i class="icon iconfont icon-jia"></i>
</button>
</div>
......@@ -322,11 +322,11 @@
<div class="mui-col-sm-5 mui-col-xs-5">
<div class="clr add-num">
<div class="mui-numbox edit-input">
<button class="mui-btn mui-btn-numbox-minus " type="button" @click="changeNumber(item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,1)">
<button class="mui-btn mui-btn-numbox-minus " type="button" @click="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,1)">
<i class="icon iconfont icon-jian"></i>
</button>
<input class="mui-input-numbox valuep" type="number" :id="'test'+item.cart_id" @blur="changeNumber(item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,3)" :value="item.goods_number | numberCode">
<button class="mui-btn mui-btn-numbox-plus " type="button" @click="changeNumber(item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,2)">
<input class="mui-input-numbox valuep" type="number" :id="'test'+item.cart_id" @blur="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,3)" :value="item.goods_number | numberCode">
<button class="mui-btn mui-btn-numbox-plus " type="button" @click="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,2)">
<i class="icon iconfont icon-jia"></i>
</button>
</div>
......@@ -405,11 +405,11 @@
<div class="mui-col-sm-5 mui-col-xs-5">
<div class="clr add-num">
<div class="mui-numbox edit-input">
<button class="mui-btn mui-btn-numbox-minus " type="button" @click="changeNumber(item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,1)">
<button class="mui-btn mui-btn-numbox-minus " type="button" @click="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,1)">
<i class="icon iconfont icon-jian"></i>
</button>
<input class="mui-input-numbox valuep" type="number" :id="'test'+item.cart_id" @blur="changeNumber(item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,3)" :value="item.goods_number | numberCode">
<button class="mui-btn mui-btn-numbox-plus " type="button" @click="changeNumber(item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,2)">
<input class="mui-input-numbox valuep" type="number" :id="'test'+item.cart_id" @blur="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,3)" :value="item.goods_number | numberCode">
<button class="mui-btn mui-btn-numbox-plus " type="button" @click="changeNumber(item.allow_presale,item.ac_type,item.goods_number,item.mpl,item.min_buy,item.stock,item.cart_id,2)">
<i class="icon iconfont icon-jia"></i>
</button>
</div>
......@@ -1041,7 +1041,7 @@
url_:confirm_
})
},
changeNumber:function(goodType,number,mpq,min,stock,cart_id,type){
changeNumber:function(allowPresale,goodType,number,mpq,min,stock,cart_id,type){
var self=this;
var num=Util.aggxde(number),
mpq=Util.aggxde(mpq),//包装数或者倍数
......@@ -1083,7 +1083,7 @@
});
return;
}else if(self.type == 2){
if(goodType == 6){
if(goodType == 6 && allowPresale == 1){
self.$toast("想要购买更多，请联系客服");
var inputVal = num||0;
......@@ -1120,8 +1120,7 @@
duration: 1500
});
}else if(self.type==2){
console.log(11111)
if(goodType == 6){
if(goodType == 6 && allowPresale == 1){
self.$toast("想要购买更多，请联系客服");
var inputVal = num||0;
if(inputVal!==0||inputVal!==mpq){
......
src/views/common/zyDetail.vue
......@@ -312,7 +312,8 @@ export default {
if (Number(now) > this.stockNum) {
this.isYushou=true;
this.tipText = "库存不足，下单后我们将帮您订货";
if(this.goodDetail.ac_type == 6){
console.log(this.goodDetail)
if(this.goodDetail.ac_type == 6 && this.goodDetail.allow_presale == 1){
this.$toast("想要购买更多，请联系客服");
var maxNum;
var inputVal;
......@@ -368,6 +369,13 @@ export default {
"https://www.ichunt.com/v3/dist/res/m/images/materiel_img_3.png";
},
changeNav(i) {
if(this.navInit == i){
return
}
if(this.goodDetail.ac_type == 6 && this.goodDetail.allow_presale == 1 && this.goodDetail.aggregateNum>this.goodDetail.stockNum){
this.$toast("想要购买更多，请联系客服");
return
}
this.navInit = i;
if (i == 1) {
if (this.goodsNum % this.aggregateNum) {
......
view/10.js
This diff could not be displayed because it is too large.
view/11.js
This diff could not be displayed because it is too large.
view/12.js
This diff could not be displayed because it is too large.
view/13.js
This diff could not be displayed because it is too large.
view/14.js
This diff could not be displayed because it is too large.
view/15.js
This diff could not be displayed because it is too large.
view/16.js
This diff could not be displayed because it is too large.
view/18.js
This diff could not be displayed because it is too large.
view/19.js
This diff could not be displayed because it is too large.
view/2.js
This diff could not be displayed because it is too large.
view/20.js
This diff could not be displayed because it is too large.
view/21.js
This diff could not be displayed because it is too large.
view/22.js
This diff could not be displayed because it is too large.
view/23.js
This diff could not be displayed because it is too large.
view/24.js
This diff could not be displayed because it is too large.
view/25.js
This diff could not be displayed because it is too large.
view/26.js
This diff could not be displayed because it is too large.
view/28.js
This diff could not be displayed because it is too large.
view/29.js
This diff could not be displayed because it is too large.
view/3.js
This diff could not be displayed because it is too large.
view/30.js
This diff could not be displayed because it is too large.
view/31.js
This diff could not be displayed because it is too large.
view/33.js
This diff could not be displayed because it is too large.
view/34.js
This diff could not be displayed because it is too large.
view/35.js
This diff could not be displayed because it is too large.
view/36.js
This diff could not be displayed because it is too large.
view/37.js
This diff could not be displayed because it is too large.
view/38.js
This diff could not be displayed because it is too large.
view/39.js
This diff could not be displayed because it is too large.
view/4.js
This diff could not be displayed because it is too large.
view/40.js
This diff could not be displayed because it is too large.
view/41.js
This diff could not be displayed because it is too large.
view/42.js
This diff could not be displayed because it is too large.
view/43.js
This diff could not be displayed because it is too large.
view/46.js
This diff could not be displayed because it is too large.
view/48.js
This diff could not be displayed because it is too large.
view/5.js
This diff could not be displayed because it is too large.
view/6.js
This diff could not be displayed because it is too large.
view/7.js
This diff could not be displayed because it is too large.
view/8.js
This diff could not be displayed because it is too large.
view/9.js
This diff could not be displayed because it is too large.
view/app.js
This diff could not be displayed because it is too large.
view/index.html
......@@ -18,7 +18,7 @@
<meta name="x5-page-mode" content="app">
<meta name="keywords" content="电子元器件,ic交易网,电子元件,元器件,电子元件商城,IC芯片,猎芯网">
<meta name="description" content="猎芯网（www.Ichunt.com）是国内外知名的买电子元器件、电子元件、元器件采购商城平台，IC交易网站。为客户提供电子元器件现货批发采购，IC采购，进口报关，元器件寄售，供应链金融等一站式电子元器件采购服务">
<link rel="icon" href="//static.leixin.com/favicon.ico">
<link rel="icon" href="//szh5static.ichunt.com/favicon.ico">
<link rel="stylesheet" href="/v3/dist/res/m/css/font/iconfont.css">
<script type="text/javascript" src="/h5/view/get_time.php"></script>
<script type="text/javascript">
......@@ -26,9 +26,9 @@
</script>
<script src="https://res.wx.qq.com/open/js/jweixin-1.4.0.js" type="text/javascript" charset="utf-8"></script>
<script src="https://qzonestyle.gtimg.cn/qzone/qzact/common/share/share.js" type="text/javascript" charset="utf-8"></script>
<script src="//static.leixin.com/static/js/flexible.min.js" type="text/javascript" charset="utf-8"></script>
<script src="//static.leixin.com/static/js/shence.min.js" type="text/javascript" charset="utf-8"></script>
<link href="//static.leixin.com/0.js" rel="prefetch"><link href="//static.leixin.com/1.js" rel="prefetch"><link href="//static.leixin.com/10.js" rel="prefetch"><link href="//static.leixin.com/11.js" rel="prefetch"><link href="//static.leixin.com/12.js" rel="prefetch"><link href="//static.leixin.com/13.js" rel="prefetch"><link href="//static.leixin.com/14.js" rel="prefetch"><link href="//static.leixin.com/15.js" rel="prefetch"><link href="//static.leixin.com/16.js" rel="prefetch"><link href="//static.leixin.com/17.js" rel="prefetch"><link href="//static.leixin.com/18.js" rel="prefetch"><link href="//static.leixin.com/19.js" rel="prefetch"><link href="//static.leixin.com/2.js" rel="prefetch"><link href="//static.leixin.com/20.js" rel="prefetch"><link href="//static.leixin.com/21.js" rel="prefetch"><link href="//static.leixin.com/22.js" rel="prefetch"><link href="//static.leixin.com/23.js" rel="prefetch"><link href="//static.leixin.com/24.js" rel="prefetch"><link href="//static.leixin.com/25.js" rel="prefetch"><link href="//static.leixin.com/26.js" rel="prefetch"><link href="//static.leixin.com/27.js" rel="prefetch"><link href="//static.leixin.com/28.js" rel="prefetch"><link href="//static.leixin.com/29.js" rel="prefetch"><link href="//static.leixin.com/3.js" rel="prefetch"><link href="//static.leixin.com/30.js" rel="prefetch"><link href="//static.leixin.com/31.js" rel="prefetch"><link href="//static.leixin.com/32.js" rel="prefetch"><link href="//static.leixin.com/33.js" rel="prefetch"><link href="//static.leixin.com/34.js" rel="prefetch"><link href="//static.leixin.com/35.js" rel="prefetch"><link href="//static.leixin.com/36.js" rel="prefetch"><link href="//static.leixin.com/37.js" rel="prefetch"><link href="//static.leixin.com/38.js" rel="prefetch"><link href="//static.leixin.com/39.js" rel="prefetch"><link href="//static.leixin.com/4.js" rel="prefetch"><link href="//static.leixin.com/40.js" rel="prefetch"><link href="//static.leixin.com/41.js" rel="prefetch"><link href="//static.leixin.com/42.js" rel="prefetch"><link href="//static.leixin.com/43.js" rel="prefetch"><link href="//static.leixin.com/44.js" rel="prefetch"><link href="//static.leixin.com/45.js" rel="prefetch"><link href="//static.leixin.com/46.js" rel="prefetch"><link href="//static.leixin.com/47.js" rel="prefetch"><link href="//static.leixin.com/48.js" rel="prefetch"><link href="//static.leixin.com/49.js" rel="prefetch"><link href="//static.leixin.com/5.js" rel="prefetch"><link href="//static.leixin.com/50.js" rel="prefetch"><link href="//static.leixin.com/6.js" rel="prefetch"><link href="//static.leixin.com/7.js" rel="prefetch"><link href="//static.leixin.com/8.js" rel="prefetch"><link href="//static.leixin.com/9.js" rel="prefetch"><link href="//static.leixin.com/app.js" rel="preload" as="script"></head>
<script src="//szh5static.ichunt.com/static/js/flexible.min.js" type="text/javascript" charset="utf-8"></script>
<script src="//szh5static.ichunt.com/static/js/shence.min.js" type="text/javascript" charset="utf-8"></script>
<link href="//szh5static.ichunt.com/0.js" rel="prefetch"><link href="//szh5static.ichunt.com/1.js" rel="prefetch"><link href="//szh5static.ichunt.com/10.js" rel="prefetch"><link href="//szh5static.ichunt.com/11.js" rel="prefetch"><link href="//szh5static.ichunt.com/12.js" rel="prefetch"><link href="//szh5static.ichunt.com/13.js" rel="prefetch"><link href="//szh5static.ichunt.com/14.js" rel="prefetch"><link href="//szh5static.ichunt.com/15.js" rel="prefetch"><link href="//szh5static.ichunt.com/16.js" rel="prefetch"><link href="//szh5static.ichunt.com/17.js" rel="prefetch"><link href="//szh5static.ichunt.com/18.js" rel="prefetch"><link href="//szh5static.ichunt.com/19.js" rel="prefetch"><link href="//szh5static.ichunt.com/2.js" rel="prefetch"><link href="//szh5static.ichunt.com/20.js" rel="prefetch"><link href="//szh5static.ichunt.com/21.js" rel="prefetch"><link href="//szh5static.ichunt.com/22.js" rel="prefetch"><link href="//szh5static.ichunt.com/23.js" rel="prefetch"><link href="//szh5static.ichunt.com/24.js" rel="prefetch"><link href="//szh5static.ichunt.com/25.js" rel="prefetch"><link href="//szh5static.ichunt.com/26.js" rel="prefetch"><link href="//szh5static.ichunt.com/27.js" rel="prefetch"><link href="//szh5static.ichunt.com/28.js" rel="prefetch"><link href="//szh5static.ichunt.com/29.js" rel="prefetch"><link href="//szh5static.ichunt.com/3.js" rel="prefetch"><link href="//szh5static.ichunt.com/30.js" rel="prefetch"><link href="//szh5static.ichunt.com/31.js" rel="prefetch"><link href="//szh5static.ichunt.com/32.js" rel="prefetch"><link href="//szh5static.ichunt.com/33.js" rel="prefetch"><link href="//szh5static.ichunt.com/34.js" rel="prefetch"><link href="//szh5static.ichunt.com/35.js" rel="prefetch"><link href="//szh5static.ichunt.com/36.js" rel="prefetch"><link href="//szh5static.ichunt.com/37.js" rel="prefetch"><link href="//szh5static.ichunt.com/38.js" rel="prefetch"><link href="//szh5static.ichunt.com/39.js" rel="prefetch"><link href="//szh5static.ichunt.com/4.js" rel="prefetch"><link href="//szh5static.ichunt.com/40.js" rel="prefetch"><link href="//szh5static.ichunt.com/41.js" rel="prefetch"><link href="//szh5static.ichunt.com/42.js" rel="prefetch"><link href="//szh5static.ichunt.com/43.js" rel="prefetch"><link href="//szh5static.ichunt.com/44.js" rel="prefetch"><link href="//szh5static.ichunt.com/45.js" rel="prefetch"><link href="//szh5static.ichunt.com/46.js" rel="prefetch"><link href="//szh5static.ichunt.com/47.js" rel="prefetch"><link href="//szh5static.ichunt.com/48.js" rel="prefetch"><link href="//szh5static.ichunt.com/49.js" rel="prefetch"><link href="//szh5static.ichunt.com/5.js" rel="prefetch"><link href="//szh5static.ichunt.com/50.js" rel="prefetch"><link href="//szh5static.ichunt.com/6.js" rel="prefetch"><link href="//szh5static.ichunt.com/7.js" rel="prefetch"><link href="//szh5static.ichunt.com/8.js" rel="prefetch"><link href="//szh5static.ichunt.com/9.js" rel="prefetch"><link href="//szh5static.ichunt.com/app.js" rel="preload" as="script"></head>
<body class="boxsiz">
<noscript>
<strong>网站出现了一点小问题，正在紧急修复中.......</strong>
......@@ -279,5 +279,5 @@
sensors.quick('autoTrack');
}
</script>
<script type="text/javascript" src="//static.leixin.com/app.js"></script></body>
<script type="text/javascript" src="//szh5static.ichunt.com/app.js"></script></body>
</html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment