Skip to content

梁建民 / h5

Go to a project
Commit 8d8a617c by 施宇
Options

Merge branch 'XK_sample20190923' into Development 

# Conflicts:
#	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/20.js
#	view/21.js
#	view/3.js
#	view/37.js
#	view/38.js
#	view/47.js
#	view/6.js
#	view/7.js
#	view/8.js
#	view/9.js
#	view/app.js
parents 36bfd3cc 04738305
Expand all
Inline Side-by-side
Showing with 707 additions and 127 deletions
package.json
......@@ -13,7 +13,8 @@
"vant": "^2.0.1",
"vue": "^2.5.21",
"vue-router": "^3.0.1",
"vuex": "^3.0.1"
"vuex": "^3.0.1",
"weixin-js-sdk": "^1.4.0-test"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.3.0",
......@@ -36,4 +37,4 @@
"last 2 versions",
"not ie <= 8"
]
}
\ No newline at end of file
}
src/api/index.js
......@@ -361,6 +361,19 @@ export const apis = {
defaultClass: productionUrl + 'api/defaultClass',
/******添加到购物车或者下单 */
addGood: productionUrlApi + '/cart/add',
/******自营样片订单提交接口 */
selfSampleCreate: productionUrlApi + '/order/selfsamplecreate',
/** 获取用户领取机会、邀约人数*/
getusersampleinfo: productionUrlApi + '/user/getusersampleinfo',
/** 自营样片邀约登录接口*/
loginsampleaction: productionUrlApi + '/login/sampleaction',
/** 获取样片列表*/
samplelist: productionUrlApi + '/sample/list',
/** 获取样片分类列表*/
sampleclasslist: productionUrlApi + '/sample/class/list',
/** 获取单个样片信息*/
getsampleinfo: url + 'getsampleinfo',
/**
......@@ -398,7 +411,6 @@ export const apis = {
skuList: productionUrlApi + 'sku/info',
/**获取排行榜接口**/
getlxuserrank: productionUrlApi + 'activity/getlxuserrank',
}
......@@ -653,5 +665,32 @@ export const services = {
wxShare(params) {
return axios.post(apis.wxShare, params)
},
selfSampleCreate(params) {
return axios.post(apis.selfSampleCreate, params)
},
sampleClassList(params) {
return axios.get(apis.sampleclasslist, {
params: {
...params
}
})
},
sampleList(params) {
return axios.get(apis.samplelist, {
params: {
...params
}
})
},
getUserSampleInfo(params) {
return axios.get(apis.getusersampleinfo, {
params: {
...params
}
})
},
getSampleInfo(params){
return axios.post(apis.getsampleinfo, params)
}
};
\ No newline at end of file
src/assets/css/global.scss
......@@ -331,7 +331,7 @@ font[class^="asfgd"] {
}
/**分享样式**/
.share-mask{
position: fixed;bottom:0;top:0;left:0;right:0;background: rgba(0,0,0,0.3);z-index: 999;
position: fixed;bottom:0;top:0;left:0;right:0;background: rgba(0,0,0,0.3);z-index: 9999999;
img{width:90%;float:right;}
}
/**兼容旧版本栅格布局**/
......
src/assets/css/sample/sample.css 0 → 100644
.sample {
padding-bottom: 50px;
}
.sample .ele {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
.sample .banner {
height: 173px;
width: 100%;
background: url("../../images/sample/samplebanner.png") no-repeat;
background-size: 100% 100%;
}
.sample .zititle {
padding: 15px;
}
.sample .zititle span {
color: #333;
font-size: 16px;
}
.sample .zititle font {
font-size: 12px;
color: #999;
margin-left: 10px;
height: 20px;
line-height: 20px;
}
.sample .fx_text {
color: #999;
text-align: right;
}
.sample .fx_text div {
padding: 0 15px 10px;
}
.sample .fx_text span {
color: #ffa200;
}
.sample .nav {
padding: 0 15px ;
}
.sample .nav .van-hairline--top-bottom::after {
border-width: 0 0 1px 0;
}
.sample .con .con-group {
padding: 15px;
padding-bottom: 0px;
}
.sample .con .con-group .img-box {
width: 2.933rem;
height: 2.933rem;
}
.sample .con .con-group .img-box img {
width: 100%;
height: 100%;
}
.sample .con .con-group .cb-box {
width: 6rem;
height: 2.933rem;
padding-bottom: 15px;
}
.sample .con .con-group .cb-box .title {
color: #333;
font-size: 16px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
margin-bottom: 0.15rem;
}
.sample .con .con-group .cb-box p {
color: #333;
font-size: 12px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
height: 0.45rem;
line-height: 0.45rem;
}
.sample .con .con-group .cb-box p span {
color: #666;
}
.sample .con .con-group .cb-box .btnx {
width: 3.5rem;
height: 0.7rem;
line-height: 0.7rem;
border-radius: 4px;
background: #1080d0;
color: #fff;
text-align: center;
cursor: pointer;
margin-top: 0.2rem;
}
@media screen and (max-width: 320px) {
.sample .con .con-group .cb-box {
width: 5.8rem;
height: 2.933rem;
}
.sample .con .con-group .cb-box .title {
margin-bottom: 0.05rem;
}
}
.sample .fix-btns {
position: fixed;
left: 0;
bottom: 0;
right: 0;
height: 50px;
line-height: 50px;
color: #fff;
font-size: 16px;
text-align: center;
background: #1080d0;
box-shadow: 0 0 10px #000;
cursor: pointer;
}
.sample .get-user-pop .get-user-con {
background: #fff;
width: 8.667rem;
height: 5.52rem;
border-radius: 3px;
position: fixed;
top: 50%;
left: 50%;
margin-left: -4.3335rem;
margin-top: -2.76rem;
box-shadow: 0 0 20px #e5e5e5;
z-index: 99999;
}
.sample .get-user-pop .get-user-con h3 {
color: #ffa200;
font-size: 16px;
height: 2.027rem;
line-height: 2.027rem;
text-align: center;
}
.sample .get-user-pop .get-user-con h3 i {
position: relative;
float: right;
top: -1.4rem;
color: #fff;
font-size: 20px;
}
.sample .get-user-pop .get-user-con h2 {
color: #000;
font-size: 14px;
text-align: center;
width: 60%;
margin: 0 auto;
}
.sample .get-user-pop .get-user-con span {
display: block;
cursor: pointer;
height: 30px;
line-height: 30px;
width: 150px;
text-align: center;
background: #1080d0;
color: #fff;
font-size: 14px;
border-radius: 30px;
margin: 0 auto;
margin-top: 50px;
}
.sample .get-user-pop .mask {
position: fixed;
bottom: 0;
top: 0;
left: 0;
right: 0;
background: rgba(0, 0, 0, 0.3);
z-index: 999;
}
src/assets/css/sample/sample.less
.sample{
padding-bottom:50px;
.ele{text-overflow: ellipsis;overflow: hidden;white-space: nowrap;}
.banner{
height:173px;width:100%;
......@@ -10,6 +11,16 @@
span{color:#333;font-size: 16px;}
font{font-size: 12px;color:#999;margin-left: 10px;height:20px;line-height: 20px;}
}
.fx_text{
color:#999;
text-align: right;
div{
padding:0 15px 10px;
}
span{
color:#ffa200
}
}
.nav{
padding:0 15px ;
.van-hairline--top-bottom::after {
......
src/assets/css/sample/sample.min.css
.sample .ele{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.sample .banner{height:173px;width:100%;background:url("../../images/sample/samplebanner.png") no-repeat;background-size:100% 100%}.sample .zititle{padding:15px}.sample .zititle span{color:#333;font-size:16px}.sample .zititle font{font-size:12px;color:#999;margin-left:10px;height:20px;line-height:20px}.sample .nav{padding:0 15px }.sample .nav .van-hairline--top-bottom::after{border-width:0 0 1px 0}.sample .con .con-group{padding:15px;padding-bottom:0px}.sample .con .con-group .img-box{width:2.933rem;height:2.933rem}.sample .con .con-group .img-box img{width:100%;height:100%}.sample .con .con-group .cb-box{width:6rem;height:2.933rem;padding-bottom:15px}.sample .con .con-group .cb-box .title{color:#333;font-size:16px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;margin-bottom:.15rem}.sample .con .con-group .cb-box p{color:#333;font-size:12px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;height:.45rem;line-height:.45rem}.sample .con .con-group .cb-box p span{color:#666}.sample .con .con-group .cb-box .btnx{width:3.5rem;height:.7rem;line-height:.7rem;border-radius:4px;background:#1080d0;color:#fff;text-align:center;cursor:pointer;margin-top:.2rem}@media screen and (max-width:320px){.sample .con .con-group .cb-box{width:5.8rem;height:2.933rem}.sample .con .con-group .cb-box .title{margin-bottom:.05rem}}.sample .fix-btns{position:fixed;left:0;bottom:0;right:0;height:50px;line-height:50px;color:#fff;font-size:16px;text-align:center;background:#1080d0;box-shadow:0 0 10px #000;cursor:pointer}.sample .get-user-pop .get-user-con{background:#fff;width:8.667rem;height:5.52rem;border-radius:3px;position:fixed;top:50%;left:50%;margin-left:-4.3335rem;margin-top:-2.76rem;box-shadow:0 0 20px #e5e5e5;z-index:99999}.sample .get-user-pop .get-user-con h3{color:#ffa200;font-size:16px;height:2.027rem;line-height:2.027rem;text-align:center}.sample .get-user-pop .get-user-con h3 i{position:relative;float:right;top:-1.4rem;color:#fff;font-size:20px}.sample .get-user-pop .get-user-con h2{color:#000;font-size:14px;text-align:center;width:60%;margin:0 auto}.sample .get-user-pop .get-user-con span{display:block;cursor:pointer;height:30px;line-height:30px;width:150px;text-align:center;background:#1080d0;color:#fff;font-size:14px;border-radius:30px;margin:0 auto;margin-top:50px}.sample .get-user-pop .mask{position:fixed;bottom:0;top:0;left:0;right:0;background:rgba(0,0,0,0.3);z-index:999}
\ No newline at end of file
.sample {padding-bottom: 50px;}.sample .ele{text-overflow:ellipsis;overflow:hidden;white-space:nowrap}.sample .banner{height:173px;width:100%;background:url("../../images/sample/samplebanner.png") no-repeat;background-size:100% 100%}.sample .zititle{padding:15px}.sample .zititle span{color:#333;font-size:16px}.sample .zititle font{font-size:12px;color:#999;margin-left:10px;height:20px;line-height:20px}.sample .nav{padding:0 15px }.sample .nav .van-hairline--top-bottom::after{border-width:0 0 1px 0}.sample .con .con-group{padding:15px;padding-bottom:0px}.sample .con .con-group .img-box{width:2.933rem;height:2.933rem}.sample .con .con-group .img-box img{width:100%;height:100%}.sample .con .con-group .cb-box{width:6rem;height:2.933rem;padding-bottom:15px}.sample .con .con-group .cb-box .title{color:#333;font-size:16px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;margin-bottom:.15rem}.sample .con .con-group .cb-box p{color:#333;font-size:12px;text-overflow:ellipsis;overflow:hidden;white-space:nowrap;height:.45rem;line-height:.45rem}.sample .con .con-group .cb-box p span{color:#666}.sample .con .con-group .cb-box .btnx{width:3.5rem;height:.7rem;line-height:.7rem;border-radius:4px;background:#1080d0;color:#fff;text-align:center;cursor:pointer;margin-top:.2rem}@media screen and (max-width:320px){.sample .con .con-group .cb-box{width:5.8rem;height:2.933rem}.sample .con .con-group .cb-box .title{margin-bottom:.05rem}}.sample .fix-btns{position:fixed;left:0;bottom:0;right:0;height:50px;line-height:50px;color:#fff;font-size:16px;text-align:center;background:#1080d0;box-shadow:0 0 10px #000;cursor:pointer}.sample .get-user-pop .get-user-con{background:#fff;width:8.667rem;height:5.52rem;border-radius:3px;position:fixed;top:50%;left:50%;margin-left:-4.3335rem;margin-top:-2.76rem;box-shadow:0 0 20px #e5e5e5;z-index:99999}.sample .get-user-pop .get-user-con h3{color:#ffa200;font-size:16px;height:2.027rem;line-height:2.027rem;text-align:center}.sample .get-user-pop .get-user-con h3 i{position:relative;float:right;top:-1.4rem;color:#fff;font-size:20px}.sample .get-user-pop .get-user-con h2{color:#000;font-size:14px;text-align:center;width:60%;margin:0 auto}.sample .get-user-pop .get-user-con span{display:block;cursor:pointer;height:30px;line-height:30px;width:150px;text-align:center;background:#1080d0;color:#fff;font-size:14px;border-radius:30px;margin:0 auto;margin-top:50px}.sample .get-user-pop .mask{position:fixed;bottom:0;top:0;left:0;right:0;background:rgba(0,0,0,0.3);z-index:999}
\ No newline at end of file
src/assets/css/user/coupon.less
......@@ -10,11 +10,13 @@
top:44px;
left:0px;
right:0px;
background:#fff;
z-index:99
}
}
/*优惠劵*/
.coupon-box{ padding: 0 5px; }
.coupon-box{ padding: 44px 5px 0 ; }
.coupon-box .block{overflow: hidden; margin-top: 15px; /*border-top: .1rem solid #fff;*/ border-radius: 5px; background: #fff;-webkit-box-shadow: 0 2px 5px #ddd;box-shadow: 0 2px 5px #ddd; }
.coupon-box .block dt{ width:125px; padding:10px 8px; float: left; }
.coupon-box .block dt h4{ font-size: 36px; font-family: Impact; height: 40px; line-height: 40px; text-align: center; }
......
src/router.js
......@@ -342,9 +342,11 @@ const routes = [{
},
{
path: '/sampleapply',
name:"sampleapply",
component: sampleapply,
meta: {
title: '样片申请'
title: '样片申请',
back: true
}
},
{
......
src/store/modules/common.js
......@@ -91,7 +91,10 @@ const actions = {
});
},
wxShare({commit}, payload) {
var params = Util.getParams();
let Params_={
current_url:payload.current_url
}
var params = Util.getParams(Params_);
Services.wxShare(params).then((res) => {
let data = res.data;
state.wxShareInfo=data.data;
......
src/store/modules/sample/index.js
import Vue from 'vue'
import {
Toast
} from 'vant';
import {
services as Services
} from '../../../api/index'
Vue.use(Toast);
const state = {
classList: [],
goodList: [],
loading: false,
finished: false,
goodCount: 0
}
const mutations = {
classListM(state, payload) {
state.classList = payload.data
},
goodList(state, payload) {
let arr = [];
for (let k in payload.data) {
arr.push(payload.data[k])
}
state.goodList = state.goodList.concat(arr)
}
}
const actions = {
getClasslist({
commit,
}) {
Services.sampleClassList().then((res) => {
let data = res.data;
if (data.err_code == 0) {
commit("classListM", {
data: data.data || [],
});
} else {
commit("classListM", {
data: [],
})
}
}).catch(function (err) {
commit("classListM", {
data: [],
})
});
},
getGoodList({
commit
}, payload) {
state.loading = true;
state.finished = false;
let p = payload.data.p;
if (p == 1) {
state.goodList = [];
}
let params = {
...payload.data,
limit: 10,
}
Services.sampleList(params).then((res) => {
state.loading = false;
let data = res.data;
if (data.err_code == 0) {
let totalPage = 0;
if (data.data.total) {
totalPage = Math.ceil(data.data.total / 10);
}
if (p == totalPage || !totalPage) {
state.finished = true;
}
if (data.data.total) {
commit('goodList', {
data: data.data.data
})
}
} else {
state.loading = false;
state.finished = true;
}
}).catch(function (err) {
state.loading = false;
state.finished = true;
});
}
}
export default {
state,
actions,
mutations
}
\ No newline at end of file
src/store/modules/sample/sampleapply.js
......@@ -10,6 +10,9 @@ Vue.use(Toast);
const state = {
loading: false,
addressInfo:"",
submitState:false,
ypGoodDetail:{},
ordernum:''
}
const mutations = {
recvlistSample(state, payload) {
......@@ -23,7 +26,7 @@ const actions = {
recvlistSample({commit}, payload) {
Services.recvlist().then((res) => {
let data = res.data;
state.loading = false;
// state.loading = false;
if (data.err_code == 0) {
commit({
type: 'recvlistSample',
......@@ -33,6 +36,51 @@ const actions = {
}).catch(function (err) {
});
},
selfSampleCreate({commit}, payload) {
state.loading = true;
var params = {
goods_id: payload.goods_id,
apply_num: payload.apply_num,
com_name: payload.com_name,
sample_demand_desc: payload.sample_demand_desc,
address_id: payload.address_id
}
Services.selfSampleCreate(qs.stringify(params)).then((res) => {
let data = res.data;
state.loading = false;
if (data.err_code == 0) {
state.submitState=true;
state.ordernum = data.data||''
}else if(data.err_code == '40014'){
Toast('样品库存不足');
}else{
Toast(data.err_msg);
}
}).catch(function (err) {
state.loading = false;
});
},
getDetailYp({commit}, payload) {
state.loading = true;
let Params_ = {
id: payload.data.id,
}
let params = Util.getParams(Params_);
Services.getSampleInfo(params).then((res) => {
let data = res.data;
state.loading = false;
if (data.err_code == 0) {
state.ypGoodDetail = data.data
}else{
Toast(data.err_msg);
}
}).catch(function (err) {
state.loading = false;
});
},
}
const getters = {}
......
src/views/common/wxShare.vue
......@@ -19,9 +19,13 @@
shareObj:{
title: "好物分享给你，帮我助力，我们一起免费拿样品", // 分享标题
desc: "在吗？拜托帮我点一下，你也能免费申请元器件样品~帮我助力 你拿样品", // 分享描述
// link:this.url,
link: window.location.origin+"/v3/samplereg?uid="+util.getCookie("Yo4teW_uid"), // 分享链接
imgUrl: "http://img.ichunt.com/images/ichunt/self_sample/apply.png", // 分享图标
success: function (resp) {
},
error:function(){
}
}
......@@ -41,10 +45,12 @@
}
},
created() {
this.$store.dispatch({
type: "wxShare"
});
if(util.getCookie("Yo4teW_uid")){
this.$store.dispatch({
type: "wxShare",
current_url:window.location.href
});
}
},
methods: {
share(){
......@@ -61,7 +67,7 @@
// config信息验证后会执行ready方法，所有接口调用都必须在config接口获得结果之后，config是一个客户端的异步操作，所以如果需要在 页面加载时就调用相关接口，则须把相关接口放在ready函数中调用来确保正确执行。对于用户触发时才调用的接口，则可以直接调用，不需要放在ready 函数中。
wx.ready(function(){
wx.checkJsApi({
jsApiList: ['onMenuShareTimeline','onMenuShareAppMessage'], // 需要检测的JS接口列表，所有JS接口列表见附录2,
jsApiList: ['onMenuShareTimeline','onMenuShareAppMessage','onMenuShareQQ','onMenuShareWeibo','onMenuShareQZone'], // 需要检测的JS接口列表，所有JS接口列表见附录2,
success: function(res) {
// console.log(res);
// 以键值对的形式返回，可用的api值true，不可用为false
......
src/views/sample/sampleapply.vue
<template>
<section class="sample-apply" >
<Header :title="title" :meaushow='meaushow' :bgcolor="bgcolor"></Header>
<wxShare :url="shareUrl"></wxShare>
<van-collapse v-model="activeName" accordion :border="noborder">
<van-collapse-item title="商品信息" name="1" :border="noborder">
<div class="info-con clr">
<div class="fl img-box">
<img src="static/images/news.png" alt="">
<img :src="ypGoodDetail.goods_images||'https://www.ichunt.com/v3/dist/res/m/images/materiel_img_3.png'" alt="">
</div>
<div class="fr cb-box">
<div class="title">TL431-DSFSDFSDFS-2ffF...</div>
<p><span>类别:</span> 贴片电容贴片电容贴片电容贴电容...</p>
<p><span>品牌:</span> EYANG（宇阳）EYANG（宇阳）...</p>
<p><span>最大可申请数量：</span>2</p>
<div class="fr cb-box" v-if="ypGoodDetail.goods_info">
<div class="title">{{ypGoodDetail.goods_info.goods_name}}</div>
<p><span>类别:</span> {{ypGoodDetail.goods_info.class_id1_name}}</p>
<p><span>品牌:</span>{{ypGoodDetail.goods_info.brand_name}}</p>
<p><span>最大可申请数量：</span>{{ypGoodDetail.max_number||1}}</p>
</div>
</div>
<div class="info-detail">
<p><span>型号: </span>431-DSFSDFSDFS-2ffFF2ffFSDFSDFS-2ffFF2fSDFS2f...</p>
<div class="info-detail" v-if="ypGoodDetail.goods_info">
<p><span>型号: </span>{{ypGoodDetail.goods_info.sku_name}}</p>
<p class="canshudetail">
<span>参数描述: </span>L1N4148WT1G 开关二极管 SOD-123 由LRC(乐山无线
电)设计生产制造，在猎芯网自营现货销售。L1N4148WT1G的封装
/规格参数为：SOD-123；您可以选择下载L1N4148WT1G 开关...
<span>参数描述: </span>
{{ypGoodDetail.goods_info.sku_name}}由{{ypGoodDetail.goods_info.brand_name}}设计生产制造，在猎芯网自营现货销售。{{ypGoodDetail.goods_info.goods_name}}的封装/规格参数为：{{ypGoodDetail.goods_info.encap}}；您可以选择下载{{ypGoodDetail.goods_info.sku_name}}中文资料等数据手册功能说明书，资料中有{{ypGoodDetail.goods_info.class_id1_name}}、{{ypGoodDetail.goods_info.class_id2_name}}详细使用方法及教程。
</p>
</div>
</van-collapse-item>
......@@ -27,16 +27,16 @@
</van-collapse>
<div class="form-info">
<div class="form-group">
<h3><span class="f-red">*</span>&nbsp;&nbsp;商品信息</h3>
<input type="text" placeholder="请输入申请数量，最多可申请2个" onkeyup="if(event.keyCode !=37 &amp;&amp; event.keyCode != 39){if (!/^[\d]+$/ig.test(this.value)){this.value='';}}"/>
<h3><span class="f-red">*</span>&nbsp;&nbsp;申请数量</h3>
<input type="text" v-model="apply_num" :placeholder="'请输入申请数量，最多可申请'+(ypGoodDetail.max_number||1)+'个'" onkeyup="if(event.keyCode !=37 &amp;&amp; event.keyCode != 39){if (!/^[\d]+$/ig.test(this.value)){this.value='';}}"/>
</div>
<div class="form-group">
<h3><span class="f-red">*</span>&nbsp;&nbsp;单位名称</h3>
<input type="text" placeholder="请输入单位名称" />
<input type="text" v-model="com_name" placeholder="请输入单位名称" />
</div>
<div class="form-group">
<h3><span class="f-red">*</span>&nbsp;&nbsp;项目需求描述</h3>
<textarea name="" placeholder="请输项目需求描述，如申请样品用于什么项目"></textarea>
<h3>&nbsp;&nbsp;项目需求描述</h3>
<textarea name="" v-model="sample_demand_desc" placeholder="请输项目需求描述，如申请样品用于什么项目"></textarea>
</div>
<div class="form-group by">
<h3>运费信息 <span class="fr">包邮</span></h3>
......@@ -59,12 +59,13 @@
<div class="mask"></div>
<div class="get-user-con">
<h3>恭喜获得1次免费申请样品机会<i class="icon iconfont icon-guanbi" @click="getuserf"></i></h3>
<p>样品订单编号：12019071090943</p>
<p>样品订单编号：{{ordernum}}</p>
<h2>邀请好友注册可额外获得一次样品申请机会，多邀多得</h2>
<span >点击邀请</span>
<span v-shareMask>点击邀请</span>
<div class="tips">重要提醒：审核结果​​将以短信通知给您</div>
</div>
</div>
<van-loading type="spinner" color="#000" class="loading-background" v-if="loading"/>
</section>
</template>
......@@ -74,8 +75,10 @@
import Vue from 'vue'
import {mapState} from 'vuex'
import Header from "@/views/common/Header.vue";
import { Collapse, CollapseItem } from 'vant';
Vue.use(Collapse).use(CollapseItem);
import wxShare from "@/views/common/wxShare.vue";
import { Collapse, CollapseItem ,Toast,Loading} from 'vant';
import util from "../../util/index"
Vue.use(Collapse).use(CollapseItem).use(Toast).use(Loading);
export default {
name: 'sampleapply',
data() {
......@@ -87,27 +90,72 @@
activeName:'1',
noborder:false,
successPop:false,//申请成功弹窗显示
goods_id:this.$route.query.id,
apply_num:"",
com_name:"",
sample_demand_desc:"",
shareUrl:window.location.origin+"/v3/samplereg?uid="+util.getCookie("Yo4teW_uid"),
}
},
computed: {
...mapState({
loading: state => state.sampleapply.loading,
addressInfo: state => state.sampleapply.addressInfo,
ypGoodDetail: state => state.sampleapply.ypGoodDetail,
submitState: state => state.sampleapply.submitState,
ordernum:state => state.sampleapply.ordernum,
})
},
watch:{
submitState(val){
if(val){
this.successPop=true;
}
},
apply_num(val){
let num = this.ypGoodDetail.max_number;
if(!num){
this.apply_num = 1
}else if(val>num){
this.apply_num = num
}
}
},
created() {
this.$store.dispatch({
type: "getDetailYp",
data: { id: this.goods_id }
});
this.$store.dispatch({
type: 'recvlistSample'
})
},
methods: {
getuserf(){
this.successPop=false;
this.successPop=false;
window.location.href='/v3/user/order';
},
submitS(){
this.successPop=true;
var self=this;
if(!this.apply_num){
Toast("请输入申请数量");
return;
}
if(!this.com_name){
Toast("请输入单位名称");
return;
}
this.$store.dispatch({
type: 'selfSampleCreate',
goods_id: self.goods_id,
apply_num: self.apply_num,
com_name: self.com_name,
sample_demand_desc: self.sample_demand_desc,
address_id: self.addressInfo.address_id
})
},
addressSample(adderssId){
window.location.href='/h5/view/#/userAddress?points='+adderssId;
......@@ -117,7 +165,8 @@
}
},
components: {
Header
Header,
wxShare
}
}
......
view/1.js
......@@ -8,7 +8,7 @@
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es6_number_constructor__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es6.number.constructor */ \"./node_modules/_core-js@2.6.9@core-js/modules/es6.number.constructor.js\");\n/* harmony import */ var core_js_modules_es6_number_constructor__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_number_constructor__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _views_common_Menu_vue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @/views/common/Menu.vue */ \"./src/views/common/Menu.vue\");\n/* harmony import */ var vant__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vant */ \"./node_modules/_vant@2.2.3@vant/es/index.js\");\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"header-page\",\n props: {\n color: {\n type: String,\n default: \"\"\n },\n historyb: {\n type: Boolean,\n default: false\n },\n zy1Length: {\n type: Number,\n default: 0\n },\n ly1Length: {\n type: Number,\n default: 0\n },\n ly2Length: {\n type: Number,\n default: 0\n },\n bgcolor: {\n type: String,\n default: \"#f3f3f3\"\n },\n isCar: {\n type: Boolean,\n default: false\n },\n inputShow: {\n type: Boolean,\n default: false\n },\n title: {\n type: String,\n default: \"猎芯网\"\n },\n meaushow: {\n type: Boolean,\n default: false\n }\n },\n data: function data() {\n return {\n type: 1,\n //自营2 //联营1,\n borderBottom: \"0px\"\n };\n },\n mounted: function mounted() {},\n created: function created() {\n if (this.bgcolor == \"#fff\") {\n this.borderBottom = \"1px solid #d6d7dc\";\n }\n },\n methods: {\n historyback: function historyback() {\n history.go(-1);\n },\n toSearch: function toSearch() {\n this.$emit('toSearch');\n },\n toSomeThing: function toSomeThing() {\n this.$emit('toSomeThing');\n },\n listTab: function listTab(type) {\n this.type = type;\n this.$emit('listTab', type);\n }\n },\n components: {\n \"van-field\": vant__WEBPACK_IMPORTED_MODULE_2__[\"Field\"],\n \"van-icon\": vant__WEBPACK_IMPORTED_MODULE_2__[\"Icon\"],\n Menu: _views_common_Menu_vue__WEBPACK_IMPORTED_MODULE_1__[\"default\"]\n }\n});\n\n//# sourceURL=webpack:///./src/views/common/Header.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!./node_modules/_babel-loader@8.0.6@babel-loader/lib!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.1@vue-loader/lib??vue-loader-options");
eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es6_number_constructor__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es6.number.constructor */ \"./node_modules/_core-js@2.6.9@core-js/modules/es6.number.constructor.js\");\n/* harmony import */ var core_js_modules_es6_number_constructor__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_number_constructor__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var _views_common_Menu_vue__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @/views/common/Menu.vue */ \"./src/views/common/Menu.vue\");\n/* harmony import */ var vant__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! vant */ \"./node_modules/_vant@2.2.5@vant/es/index.js\");\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: \"header-page\",\n props: {\n color: {\n type: String,\n default: \"\"\n },\n historyb: {\n type: Boolean,\n default: false\n },\n zy1Length: {\n type: Number,\n default: 0\n },\n ly1Length: {\n type: Number,\n default: 0\n },\n ly2Length: {\n type: Number,\n default: 0\n },\n bgcolor: {\n type: String,\n default: \"#f3f3f3\"\n },\n isCar: {\n type: Boolean,\n default: false\n },\n inputShow: {\n type: Boolean,\n default: false\n },\n title: {\n type: String,\n default: \"猎芯网\"\n },\n meaushow: {\n type: Boolean,\n default: false\n }\n },\n data: function data() {\n return {\n type: 1,\n //自营2 //联营1,\n borderBottom: \"0px\"\n };\n },\n mounted: function mounted() {},\n created: function created() {\n if (this.bgcolor == \"#fff\") {\n this.borderBottom = \"1px solid #d6d7dc\";\n }\n },\n methods: {\n historyback: function historyback() {\n history.go(-1);\n },\n toSearch: function toSearch() {\n this.$emit('toSearch');\n },\n toSomeThing: function toSomeThing() {\n this.$emit('toSomeThing');\n },\n listTab: function listTab(type) {\n this.type = type;\n this.$emit('listTab', type);\n }\n },\n components: {\n \"van-field\": vant__WEBPACK_IMPORTED_MODULE_2__[\"Field\"],\n \"van-icon\": vant__WEBPACK_IMPORTED_MODULE_2__[\"Icon\"],\n Menu: _views_common_Menu_vue__WEBPACK_IMPORTED_MODULE_1__[\"default\"]\n }\n});\n\n//# sourceURL=webpack:///./src/views/common/Header.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!./node_modules/_babel-loader@8.0.6@babel-loader/lib!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.1@vue-loader/lib??vue-loader-options");
/***/ }),
......
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/15.js
......@@ -8,7 +8,11 @@
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
<<<<<<< HEAD
eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es7.object.get-own-property-descriptors */ \"./node_modules/_core-js@2.6.9@core-js/modules/es7.object.get-own-property-descriptors.js\");\n/* harmony import */ var core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/web.dom.iterable */ \"./node_modules/_core-js@2.6.9@core-js/modules/web.dom.iterable.js\");\n/* harmony import */ var core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es6.array.iterator */ \"./node_modules/_core-js@2.6.9@core-js/modules/es6.array.iterator.js\");\n/* harmony import */ var core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es6.object.keys */ \"./node_modules/_core-js@2.6.9@core-js/modules/es6.object.keys.js\");\n/* harmony import */ var core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3__);\n/* harmony import */ var D_lxWork_h5_node_modules_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/defineProperty */ \"./node_modules/_@babel_runtime@7.6.2@@babel/runtime/helpers/esm/defineProperty.js\");\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! vue */ \"./node_modules/_vue@2.6.10@vue/dist/vue.runtime.esm.js\");\n/* harmony import */ var vuex__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! vuex */ \"./node_modules/_vuex@3.1.1@vuex/dist/vuex.esm.js\");\n\n\n\n\n\n\nfunction ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }\n\nfunction _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { Object(D_lxWork_h5_node_modules_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_4__[\"default\"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: 'ranking',\n data: function data() {\n return {\n title: \"猎芯网-京东战投电子元器件商城_一站式解决电子元器件采购难题\"\n };\n },\n computed: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_6__[\"mapState\"])({\n rankList: function rankList(state) {\n return state.rank.rankList;\n }\n })),\n watch: {},\n created: function created() {\n this.$store.dispatch({\n type: 'getlxuserrank'\n });\n },\n methods: {\n trackShece: function trackShece() {\n sensors.track('ImmediateImpact', {\n url: window.location.href,\n pf: window.lxpf\n });\n }\n },\n components: {}\n});\n\n//# sourceURL=webpack:///./src/views/rank/ranking.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!./node_modules/_babel-loader@8.0.6@babel-loader/lib!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.1@vue-loader/lib??vue-loader-options");
=======
eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! core-js/modules/es7.object.get-own-property-descriptors */ \"./node_modules/_core-js@2.6.9@core-js/modules/es7.object.get-own-property-descriptors.js\");\n/* harmony import */ var core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es7_object_get_own_property_descriptors__WEBPACK_IMPORTED_MODULE_0__);\n/* harmony import */ var core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! core-js/modules/web.dom.iterable */ \"./node_modules/_core-js@2.6.9@core-js/modules/web.dom.iterable.js\");\n/* harmony import */ var core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_web_dom_iterable__WEBPACK_IMPORTED_MODULE_1__);\n/* harmony import */ var core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! core-js/modules/es6.array.iterator */ \"./node_modules/_core-js@2.6.9@core-js/modules/es6.array.iterator.js\");\n/* harmony import */ var core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_array_iterator__WEBPACK_IMPORTED_MODULE_2__);\n/* harmony import */ var core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es6.object.keys */ \"./node_modules/_core-js@2.6.9@core-js/modules/es6.object.keys.js\");\n/* harmony import */ var core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es6_object_keys__WEBPACK_IMPORTED_MODULE_3__);\n/* harmony import */ var E_h5_node_modules_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/esm/defineProperty */ \"./node_modules/_@babel_runtime@7.6.2@@babel/runtime/helpers/esm/defineProperty.js\");\n/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! vue */ \"./node_modules/_vue@2.6.10@vue/dist/vue.runtime.esm.js\");\n/* harmony import */ var vuex__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! vuex */ \"./node_modules/_vuex@3.1.1@vuex/dist/vuex.esm.js\");\n\n\n\n\n\n\nfunction ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }\n\nfunction _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { Object(E_h5_node_modules_babel_runtime_helpers_esm_defineProperty__WEBPACK_IMPORTED_MODULE_4__[\"default\"])(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }\n\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n//\n\n\n/* harmony default export */ __webpack_exports__[\"default\"] = ({\n name: 'ranking',\n data: function data() {\n return {\n title: \"猎芯网-京东战投电子元器件商城_一站式解决电子元器件采购难题\"\n };\n },\n computed: _objectSpread({}, Object(vuex__WEBPACK_IMPORTED_MODULE_6__[\"mapState\"])({\n rankList: function rankList(state) {\n return state.rank.rankList;\n }\n })),\n watch: {},\n created: function created() {\n this.$store.dispatch({\n type: 'getlxuserrank'\n });\n },\n methods: {\n trackShece: function trackShece() {\n sensors.track('ImmediateImpact', {\n url: window.location.href,\n pf: window.lxpf\n });\n }\n },\n components: {}\n});\n\n//# sourceURL=webpack:///./src/views/rank/ranking.vue?./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--12-0!./node_modules/_babel-loader@8.0.6@babel-loader/lib!./node_modules/_cache-loader@2.0.1@cache-loader/dist/cjs.js??ref--0-0!./node_modules/_vue-loader@15.7.1@vue-loader/lib??vue-loader-options");
>>>>>>> XK_sample20190923
/***/ }),
......
view/19.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/23.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/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/4.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.
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