Skip to content

肖康 / H5_2.0

Go to a project
Commit ca98a992 by LJM
Options

Merge branch 'master' of http://git.ichunt.net/xiaokang/H5_2.0

parents b844be28 5a8c0add
Inline Side-by-side
Showing with 205 additions and 19 deletions
assets/css/car/car.scss
...@@ -112,7 +112,6 @@ ...@@ -112,7 +112,6 @@
background: #FFFFFF; background: #FFFFFF;
border-radius: 10rpx; border-radius: 10rpx;
padding:24rpx; padding:24rpx;
.edit{ .edit{
color:$uni-color999; color:$uni-color999;
font-size: 24rpx; font-size: 24rpx;
......
assets/css/search/searchlist.scss
...@@ -110,14 +110,32 @@ ...@@ -110,14 +110,32 @@
} }
} }
.databox{ .databoxgroup{
width:100%; width:100%;
padding:0 24rpx; padding:0 24rpx;
background: #fff; background: #fff;
margin-bottom: 16rpx;
.grouphead{
height:80rpx;
image{height:40rpx;width:128rpx;}
padding:24rpx 0;
text{
font-size: 26rpx;
font-weight: 600;
margin-left: 24rpx;
color: $uni-color666;
box-sizing: border-box;
}
a{
color: $uni-color666;
font-size: 24rpx;
max-width: 300rpx;
}
}
.group{ .group{
padding:24rpx 0; padding:24rpx 0;
border-bottom: 1rpx solid #F5F5F7; border-top: 1rpx solid #F5F5F7;
.toprs1{ .toprs1{
height:48rpx; height:48rpx;
line-height: 48rpx; line-height: 48rpx;
......
components/ay-operate/del_slideLeft.vue
<template> <template>
<view>
<view class="box-slideLeft" > <view class="box-slideLeft" >
<view class="touch-item touch-slideLeft " @touchstart="touchS" @touchmove="touchM" @touchend="touchE" :style="item_show.txtStyle"> <view class="touch-item touch-slideLeft " @touchstart="touchS" @touchmove="touchM" @touchend="touchE" :style="item_show.txtStyle">
<slot /> <slot />
...@@ -10,7 +9,6 @@ ...@@ -10,7 +9,6 @@
</view> </view>
</view> </view>
</view>
</template> </template>
<script> <script>
......
components/bottom_nav.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<text class="icon iconfont icon-home"></text> <text class="icon iconfont icon-home"></text>
<view>首页</view> <view>首页</view>
</navigator> </navigator>
<navigator url="#" class="navitem" :class="{ act: actval == 2 }"> <navigator url="/sitmap" class="navitem" :class="{ act: actval == 2 }">
<text class="icon iconfont icon-class"></text> <text class="icon iconfont icon-class"></text>
<view>分类</view> <view>分类</view>
</navigator> </navigator>
......
manifest.json
...@@ -18,6 +18,23 @@ ...@@ -18,6 +18,23 @@
"^/apis": "" "^/apis": ""
} }
}, },
"/es": {
"target": "http://so.liexin.net",
"changeOrigin": true,
"secure": true,
"pathRewrite": {
"/es": ""
}
},
"/esgo": {
"target": "https://s.ichunt.com",
"changeOrigin": true,
"secure": true,
"pathRewrite": {
"/esgo": ""
}
},
"/v3": { "/v3": {
"target": "http://www.liexin.com", "target": "http://www.liexin.com",
"changeOrigin": true, "changeOrigin": true,
......
pages.json
...@@ -24,6 +24,18 @@ ...@@ -24,6 +24,18 @@
} }
}, },
{ {
"path": "pages/classp/map",
"style": {
"navigationBarTitleText": "分类选型"
}
},
{
"path": "pages/classp/list",
"style": {
"navigationBarTitleText": "分类列表"
}
},
{
"path": "pages/mine/login", "path": "pages/mine/login",
"style": { "style": {
"navigationBarTitleText": "登录" "navigationBarTitleText": "登录"
......
pages/car/car.vue
...@@ -88,8 +88,8 @@ ...@@ -88,8 +88,8 @@
</view> </view>
</view> </view>
</delSlideLeft> </delSlideLeft>
<view class="pagebot">—— 已经到底了 ——</view>
</view> </view>
<view class="pagebot">—— 已经到底了 ——</view>
<view class="nodata" style="display:none;"> <view class="nodata" style="display:none;">
<image src="https://img.ichunt.com/images/ichunt/202304/11/124e12f1e680f6eb5f5f46780d679eb3.png"> <image src="https://img.ichunt.com/images/ichunt/202304/11/124e12f1e680f6eb5f5f46780d679eb3.png">
</image> </image>
......
pages/classp/list.vue 0 → 100644
<template>
</template>
<script>
</script>
<style>
</style>
\ No newline at end of file
pages/classp/map.vue 0 → 100644
<template>
<view class="page mapPage">
asdasda
<bottomNavFixed actval="2" />
</view>
</template>
<script>
import {Ichunt_Api,Api_Url} from '@/util/api.js';
import bottomNavFixed from '@/components/bottom_nav.vue';
export default {
data() {
return {
};
},
onShow() {
this.getData();
},
methods: {
getData() {
// this.request(Api_Url + "/msg/allnum", 'POST', {}, ).then(res => {
// if (res.err_code === 0) {
// this.newscount=res.data
// }
// });
}
},
components: {
bottomNavFixed
}
};
</script>
<style scoped lang="scss">
@import '../../assets/css/index/index.scss';
</style>
\ No newline at end of file
pages/search/search.vue
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
</template> </template>
<script> <script>
import {Ichunt_Api,Api_Url,Api_Es} from '@/util/api.js'; import {Ichunt_Api,Api_Url,Api_Es,Api_ES_Go} from '@/util/api.js';
export default { export default {
data() { data() {
return { return {
...@@ -79,6 +79,13 @@ ...@@ -79,6 +79,13 @@
this.getData() this.getData()
}, },
methods: { methods: {
getListPOI(val_){
this.request(Api_ES_Go + "/api/think", 'POST', {k:val_}, ).then(res => {
if (res.err_code === 0) {
}
});
},
getData(){ getData(){
this.request(Ichunt_Api + "/api/common/data", 'GET', {}, ).then(res => { this.request(Ichunt_Api + "/api/common/data", 'GET', {}, ).then(res => {
if (res.err_code === 0) { if (res.err_code === 0) {
...@@ -102,7 +109,7 @@ ...@@ -102,7 +109,7 @@
this.searchVal=e.detail.value; this.searchVal=e.detail.value;
clearTimeout(this.timeout); clearTimeout(this.timeout);
this.timeout = setTimeout(() => { this.timeout = setTimeout(() => {
//this.getListPOI(curVal); this.getListPOI(this.searchVal);
}, 300); }, 300);
}, },
clearInput(){ clearInput(){
......
pages/search/searchlist.vue
...@@ -16,12 +16,65 @@ ...@@ -16,12 +16,65 @@
<view class="rank1 row ">综合</view> <view class="rank1 row ">综合</view>
<view class="rank2 row sjpx act top">库存</view> <view class="rank2 row sjpx act top">库存</view>
<view class="rank3 row sjpx act bot">价格</view> <view class="rank3 row sjpx act bot">价格</view>
<view class="sxbox row" @click="shiftPopShow=!shiftPopShow">筛选<text class="icon iconfont icon-sxs"></text></view> <view class="sxbox row" @click="shiftPopShow=!shiftPopShow">筛选<text
class="icon iconfont icon-sxs"></text></view>
</view> </view>
</view> </view>
<view class="cons"> <view class="cons">
<view class="databox" v-show="list.length>0"> <view class="databox">
<view class="group" v-for="(item,index) in list" :key="index"> <view class="databoxgroup">
<view class="grouphead row bothSide">
<view class="row">
<image
src="https://img.ichunt.com/images/cms/202101/18/9b017ebeeb8594aeb3c0490272128ab2.jpg">
</image>
<text>Mouser</text>
</view>
<a href="" class="elep">啊实打实大苏打啊实打实阿斯顿萨达啊实打实</a>
</view>
<view class="group">
<view class="toprs1 row bothSide">
<navigator url="#" class="row">
<view class="goodsName elep">LM358adsasd</view>
<view class="actag">95折</view>
</navigator>
<view class="addcar" style="display:none;" @click="addcarpopfunc('10001')">加入购物车</view>
<view class="kfbtns" @click="addcarpopfunc('10001')">联系客服</view>
</view>
<view class="toprs2 row bothSide">
<view class="l2 elep"><text class="labelsd">品牌：</text>ST</view>
<view class="r2 elep"><text class="labelsd">起订量：</text>600</view>
</view>
<view class="toprs2 row bothSide">
<view class="l2 elep"><text class="labelsd">供应商：</text>mouser</view>
<view class="r2 elep"><text class="labelsd">库存：</text>6000000</view>
</view>
<view class="toprs3 row bothSide">
<view class="row">
<text class="labelsd">价格：</text>
<view class="row priceb">
<text class="p1">660+</text>
<text class="p2">￥130.86</text>
<text class="p3">$130.86</text>
</view>
</view>
<text class="labelsd" @click="addcarpopfunc('10001')">更多阶梯价<text
class="icon iconfont icon-arrbot"></text></text>
</view>
</view>
</view>
<view class="databoxgroup">
<view class="grouphead row bothSide">
<view class="row">
<image
src="https://img.ichunt.com/images/cms/202101/18/9b017ebeeb8594aeb3c0490272128ab2.jpg">
</image>
<text>Mouser</text>
</view>
<a href="" class="elep">啊实打实大苏打啊实打实阿斯顿萨达啊实打实</a>
</view>
<view class="group">
<view class="toprs1 row bothSide"> <view class="toprs1 row bothSide">
<navigator url="#" class="row"> <navigator url="#" class="row">
<view class="goodsName elep">LM358adsasd</view> <view class="goodsName elep">LM358adsasd</view>
...@@ -48,7 +101,9 @@ ...@@ -48,7 +101,9 @@
<text class="p3">$130.86</text> <text class="p3">$130.86</text>
</view> </view>
</view> </view>
<text class="labelsd" @click="addcarpopfunc('10001')">更多阶梯价<text class="icon iconfont icon-arrbot"></text></text> <text class="labelsd" @click="addcarpopfunc('10001')">更多阶梯价<text
class="icon iconfont icon-arrbot"></text></text>
</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -116,7 +171,7 @@ ...@@ -116,7 +171,7 @@
export default { export default {
data() { data() {
return { return {
shiftPopShow:false,//筛选弹窗状态 shiftPopShow: false, //筛选弹窗状态
searchVal: "", //搜索值 searchVal: "", //搜索值
list: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] list: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
} }
...@@ -148,10 +203,10 @@ ...@@ -148,10 +203,10 @@
getData() { getData() {
}, },
searchgo(){ searchgo() {
this.shiftPopShow=!this.shiftPopShow; this.shiftPopShow = !this.shiftPopShow;
}, },
addcarpopfunc(goods_id){ addcarpopfunc(goods_id) {
this.$refs.addCarPop.addcarpopfunc(goods_id); this.$refs.addCarPop.addcarpopfunc(goods_id);
} }
}, },
......
router/index.js
...@@ -41,6 +41,20 @@ const router = new Router({ ...@@ -41,6 +41,20 @@ const router = new Router({
} }
}, },
{ {
path: '/pages/classp/map',
aliasPath: '/sitmap',
meta: {
title: '分类选型'
}
},
{
path: '/pages/classp/list',
aliasPath: '/optimum',
meta: {
title: '分类列表'
}
},
{
path: '/pages/mine/login', path: '/pages/mine/login',
aliasPath: '/login', aliasPath: '/login',
meta: { meta: {
......
util/api.js
...@@ -3,22 +3,26 @@ ...@@ -3,22 +3,26 @@
let Ichunt_Api = ''; //3.0网站接口 let Ichunt_Api = ''; //3.0网站接口
let Api_Url = '';//api项目url let Api_Url = '';//api项目url
let Api_Es = '';//api项目url let Api_Es = '';//api项目url
let Api_ES_Go='';//型号联想
switch (window.location.hostname) { switch (window.location.hostname) {
case "m.ichunt.com": case "m.ichunt.com":
Ichunt_Api = 'https://www.ichunt.com/v3'; Ichunt_Api = 'https://www.ichunt.com/v3';
Api_Url="https://api.ichunt.com" Api_Url="https://api.ichunt.com"
Api_Es="//so12.ichunt.com" Api_Es="//so12.ichunt.com"
Api_ES_Go="https://s.ichunt.com"
break; break;
default: default:
//本地proxy配置参考vue.config.js //本地proxy配置参考vue.config.js
Ichunt_Api = '/v3' Ichunt_Api = '/v3'
Api_Url= '/apis'; Api_Url= '/apis';
Api_Es="//so12.ichunt.com" Api_Es="/es"
Api_ES_Go="/esgo"
} }
module.exports = { module.exports = {
Ichunt_Api, Ichunt_Api,
Api_Url, Api_Url,
Api_Es Api_Es,
Api_ES_Go
} }
util/util.js
...@@ -9,7 +9,13 @@ const request = (url = '', type = 'GET', param = {}, Loading) => { ...@@ -9,7 +9,13 @@ const request = (url = '', type = 'GET', param = {}, Loading) => {
var params = Object.assign(param, { var params = Object.assign(param, {
pf: 2 pf: 2
}); });
//请求es相关
if(url&&(url.indexOf("so12.ichunt.")!=-1||url.indexOf("so.liexin.net")!=-1)){
params = Object.assign(param, {
hkyefgyd: 1
});
}
//是否启动加载 //是否启动加载
if (Loading) { if (Loading) {
uni.showLoading({ uni.showLoading({
......
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