Skip to content

施宇 / icsalesProgram

Go to a project
Commit 5aa398d9 by 施宇
Options

Merge branch 'master' of http://119.23.72.7/shiyu/icsalesProgram

parents e5a4faef e37d1e65
Inline Side-by-side
Showing with 334 additions and 29 deletions
app.js
...@@ -54,9 +54,9 @@ App({ ...@@ -54,9 +54,9 @@ App({
if (this.globalData.auth) { if (this.globalData.auth) {
//是否登录 //是否登录
if (this.globalData.token) { if (this.globalData.token) {
wx.switchTab({ // wx.switchTab({
url: '/pages/tab/home/home' // url: '/pages/tab/home/home'
}); // });
} else { } else {
wx.redirectTo({ wx.redirectTo({
url: '/pages/person/login/index' url: '/pages/person/login/index'
......
pages/person/company/index.js
// pages/person/company/index.js const http = require('../../../utils/util.js');
import {
apis
} from '../../../utils/api.js';
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
userInfo: {},
business:{}
}, },
/** /**
...@@ -27,6 +33,29 @@ Page({ ...@@ -27,6 +33,29 @@ Page({
*/ */
onShow: function () { onShow: function () {
//获取数量统计
http.getData(apis.countBusiness, 'GET', {
token: wx.getStorageSync('access_token')
}, (res) => {
if (res.errcode === 0) {
this.setData({
business: res.data
});
}
}, true);
//获取用户信息
http.getData(apis.userInfo, 'GET', {
token: wx.getStorageSync('access_token')
}, (res) => {
if (res.errcode === 0) {
this.setData({
userInfo: res.data
});
}
}, true);
}, },
/** /**
...@@ -62,5 +91,20 @@ Page({ ...@@ -62,5 +91,20 @@ Page({
*/ */
onShareAppMessage: function () { onShareAppMessage: function () {
},
/**
* 跳转地址
*/
toUrl: function (e) {
//普通跳转
if (e.currentTarget.dataset.url) {
wx.navigateTo({
url: e.currentTarget.dataset.url
});
}
} }
}) })
\ No newline at end of file
pages/person/company/index.wxml
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
<view class="head boxsiz row verCenter bothSide"> <view class="head boxsiz row verCenter bothSide">
<view class="row"> <view class="row">
<view class="pic"> <view class="pic">
<cover-image class="im" src="/res/images/imgs/test.jpg"></cover-image> <cover-image class="im" src="{{userInfo.avatar}}"></cover-image>
</view> </view>
<view class="txt"> <view class="txt">
<text class="t1">深圳市猎芯科技有限公司</text> <text class="t1">{{userInfo.company_name}}</text>
<view class="row"> <view class="row">
<view class="company-txt"> <view class="company-txt">
<text class="icon iconfont iconiconxiantiaoshouji24"></text> <text class="icon iconfont iconiconxiantiaoshouji24"></text>
...@@ -18,22 +18,22 @@ ...@@ -18,22 +18,22 @@
</view> </view>
</view> </view>
</view> </view>
<view class="column"> <view class="column" data-url="/pages/person/editcompany/index" bind:tap="toUrl">
<text class="icon iconfont iconiconxiantiaoshouji22"></text> <text class="icon iconfont iconiconxiantiaoshouji22"></text>
<text class="edit">编辑</text> <text class="edit">编辑</text>
</view> </view>
</view> </view>
<view class="tab row rowCenter verCenter"> <view class="tab row rowCenter verCenter">
<view class="v"> <view class="v">
<text class="t1">513</text> <text class="t1">{{business.goods}}</text>
<text class="t2">商品</text> <text class="t2">商品</text>
</view> </view>
<view class="v"> <view class="v">
<text class="t1">53</text> <text class="t1">{{business.inquiry}}</text>
<text class="t2">询价</text> <text class="t2">询价</text>
</view> </view>
<view class="v"> <view class="v">
<text class="t1">2</text> <text class="t1">{{business.offer}}</text>
<text class="t2">报价</text> <text class="t2">报价</text>
</view> </view>
</view> </view>
...@@ -52,12 +52,12 @@ ...@@ -52,12 +52,12 @@
</view> </view>
<view class="text-introduced column"> <view class="text-introduced column">
<text class="tit">企业简介</text> <text class="tit">企业简介</text>
<text class="t1">猎芯网是由深圳市猎芯科技有限公司开发运营的电子元器件交易服务平台，可为用户提供涵盖购买、报关、仓储、金融等整个交易环节的全闭环服务。 猎芯网于2015年7月上线，总部位于深圳，在北京、香港设有分公司，迄今已获得经纬中国、微光创投、华诺创投、京东、海通证券及文华海汇等多轮融资，及E络盟与Mouser贸泽电子等多家知名分销商授权； 猎芯网提供自营、联营、寄售、供应链金融等服务，并在深圳光明新区设有一万多平米的自营仓库，实现当天下单，当天发货，订单动态全透明，极大的提升了效率 ，降低了交易成本；同时与5500多家优质供应商合作，提供超过2000万的联营商品选择，极大地满足了广大用户的采购需求！</text> <text class="t1">{{userInfo.com_desc}}</text>
</view> </view>
<view class="text-introduced column"> <view class="text-introduced column">
<text class="tit">公司地址</text> <text class="tit">公司地址</text>
<text class="t1">广东省深圳市龙岗区坂田街道五和大道南路2号万科星火Online天枢仓6栋3楼</text> <text class="t1">广东省深圳市龙岗区坂田街道五和大道南路2号万科星火Online天枢仓6栋3楼</text>
</view> </view>
<view class="btn">联系电话：15012479484</view> <view class="btn">联系电话：{{userInfo.com_tel}}</view>
</view> </view>
</view> </view>
\ No newline at end of file
pages/person/editcompany/index.js
...@@ -13,7 +13,12 @@ Page({ ...@@ -13,7 +13,12 @@ Page({
*/ */
data: { data: {
status: true, status: true,
imgSrc: '' avatar: '',
multiArray: [],
multiIndex: [4, 0, 0],
province_id: 6,
city_id: 76,
district_id: 696
}, },
/** /**
...@@ -21,6 +26,61 @@ Page({ ...@@ -21,6 +26,61 @@ Page({
*/ */
onLoad: function (options) { onLoad: function (options) {
var arr = [];
//设置默认省市区
http.getData(apis.regionPcd, 'GET', null, (res) => {
if (res.errcode === 0) {
let province = [];
res.data.forEach(function (value, index, array) {
province.push({
id: index,
region_id: value.region_id,
name: value.region_name
})
});
arr.push(province);
http.getData(apis.regionPcd, 'GET', {
province_id: 6
}, (province) => {
let city = [];
province.data.forEach(function (value, index, array) {
city.push({
id: index,
region_id: value.region_id,
name: value.region_name
})
});
arr.push(city);
http.getData(apis.regionPcd, 'GET', {
province_id: 6,
city_id: 76
}, (city) => {
let area = [];
city.data.forEach(function (value, index, array) {
area.push({
id: index,
region_id: value.region_id,
name: value.region_name
})
});
arr.push(area);
this.setData({
multiArray: arr
});
}, false, false, true);
}, false, false, true);
}
}, false, false, true);
}, },
/** /**
...@@ -79,7 +139,7 @@ Page({ ...@@ -79,7 +139,7 @@ Page({
chooseImg(apis.ossupload, 1, (res) => { chooseImg(apis.ossupload, 1, (res) => {
if (res) { if (res) {
this.setData({ this.setData({
imgSrc: res, avatar: res,
status: false status: false
}); });
} }
...@@ -90,15 +150,169 @@ Page({ ...@@ -90,15 +150,169 @@ Page({
*/ */
deleteImg: function () { deleteImg: function () {
this.setData({ this.setData({
imgSrc: '', avatar: '',
status: true status: true
}) })
}, },
/** /**
* 验证字段
*/
calcForm: function (val) {
let detail_address = val.detail_address;
let mobile = val.mobile;
return true;
},
/**
* *
* 企业提交 * 企业提交
*/ */
formSubmit: function (e) { formSubmit: function (e) {
if (this.calcForm(e.detail.value)) {
this.setData({
disabled: true,
loading: true
});
let params = Object.assign({}, e.detail.value, {
province_id: this.data.province_id,
city_id: this.data.city_id,
district_id: this.data.district_id,
avatar: this.data.avatar
});
http.getData(apis.userAccount, 'GET', params, (res) => {
if (res.errcode === 0) {
wx.navigateTo({
url: '/pages/person/company/index'
});
} else {
this.setData({
disabled: false,
loading: false
});
wx.showToast({
title: res.errmsg,
icon: 'none',
duration: 2000
});
}
}, false, false, true);
}
},
bindMultiPickerChange: function (e) {
console.log('picker发送选择改变，携带值为', e.detail.value)
this.setData({
multiIndex: e.detail.value,
province_id: this.data.multiArray[0][e.detail.value[0]].region_id,
city_id: this.data.multiArray[1][e.detail.value[1]].region_id,
district_id: this.data.multiArray[2][e.detail.value[2]].region_id
})
},
bindMultiPickerColumnChange: function (e) {
console.log('修改的列为', e.detail.column, '，值为', e.detail.value);
this.data.multiIndex[e.detail.column] = e.detail.value;
if (e.detail.column === 0) {
this.setData({
province_id: this.data.multiArray[e.detail.column][e.detail.value].region_id,
})
//更新省
http.getData(apis.regionPcd, 'GET', {
province_id: this.data.multiArray[0][e.detail.value].region_id
}, (res) => {
let city = [];
let arr = this.data.multiArray;
res.data.forEach(function (value, index, array) {
city.push({
id: index,
region_id: value.region_id,
name: value.region_name
})
});
arr.splice(1, 1, city);
this.setData({
multiArray: arr
});
let city_index = this.data.multiIndex;
city_index.splice(1, 1, 0);
this.setData({
multiIndex: city_index
});
//更新市
http.getData(apis.regionPcd, 'GET', {
province_id: this.data.multiArray[0][e.detail.value].region_id,
city_id: city[0].region_id
}, (data) => {
let area = [];
let arrs = this.data.multiArray;
data.data.forEach(function (values, indexs, arrays) {
area.push({
id: indexs,
region_id: values.region_id,
name: values.region_name
})
});
arrs.splice(2, 1, area);
this.setData({
multiArray: arrs
});
}, false, false, true);
}, false, false, true);
} else if (e.detail.column === 1) {
this.setData({
city_id: this.data.multiArray[e.detail.column][e.detail.value].region_id
})
//选择市
http.getData(apis.regionPcd, 'GET', {
province_id: this.data.province_id,
city_id: this.data.city_id
}, (res) => {
let area = [];
let arr = this.data.multiArray;
res.data.forEach(function (value, index, array) {
area.push({
id: index,
region_id: value.region_id,
name: value.region_name
})
});
arr.splice(2, 1, area);
this.setData({
multiArray: arr
});
}, false, false, true);
}
} }
}) })
\ No newline at end of file
pages/person/editcompany/index.less
...@@ -56,6 +56,11 @@ ...@@ -56,6 +56,11 @@
width: 100%; width: 100%;
height: 310rpx !important; height: 310rpx !important;
} }
.textarea-placeholder {
color: rgba(81, 85, 89, 0.5);
font-size: 28rpx;
}
} }
.list { .list {
......
pages/person/editcompany/index.wxml
...@@ -9,36 +9,42 @@ ...@@ -9,36 +9,42 @@
</block> </block>
<block wx:else> <block wx:else>
<view class="view column rowCenter verCenter"> <view class="view column rowCenter verCenter">
<cover-image src="{{imgSrc}}" class="img"></cover-image> <cover-image src="{{avatar}}" class="img"></cover-image>
<text class="icon iconfont iconiconxiantiaoshouji7" bind:tap="deleteImg"></text> <text class="icon iconfont iconiconxiantiaoshouji7" bind:tap="deleteImg"></text>
</view> </view>
</block> </block>
</view> </view>
<view class="txt"> <view class="txt">
<textarea bindblur="bindTextAreaBlur" auto-height placeholder="请输入企业简介" class="tarea" /> <textarea name='com_desc' bindblur="bindTextAreaBlur" auto-height placeholder="请输入企业简介" class="tarea" placeholder-class="textarea-placeholder" />
</view> </view>
<view class="hr"></view> <view class="hr"></view>
<view class="list row verCenter bothSide bor"> <view class="list row verCenter bothSide bor">
<view class="l">所有地区</view> <view class="l">所有地区</view>
<view class="sel"> <view class="sel row rowCenter verCenter">
<text class="t1">请选择省/市/区</text> <view>
<picker class="t1" mode="multiSelector" bindchange="bindMultiPickerChange" bindcolumnchange="bindMultiPickerColumnChange" value="{{multiIndex}}" range="{{multiArray}}" range-key="name">
{{multiArray[0][multiIndex[0]].name}}，{{multiArray[1][multiIndex[1]].name}}，{{multiArray[2][multiIndex[2]].name}}
</picker>
</view>
<text class="icon iconfont iconChevron"></text> <text class="icon iconfont iconChevron"></text>
</view> </view>
</view> </view>
<view class="list row verCenter bothSide bor"> <view class="list row verCenter bothSide bor">
<view class="l">详细地址</view> <view class="l">详细地址</view>
<view class="r"> <view class="r">
<input type="text" placeholder="请输入详细地址" placeholder-class="placeholderClass" /> <input type="text" placeholder="请输入详细地址" placeholder-class="placeholderClass" name="detail_address" />
</view> </view>
</view> </view>
<view class="list row verCenter bothSide bor"> <view class="list row verCenter bothSide bor">
<view class="l">联系电话</view> <view class="l">联系电话</view>
<view class="r"> <view class="r">
<input type="text" placeholder="请输入联系电话" placeholder-class="placeholderClass" /> <input type="text" placeholder="请输入联系电话" placeholder-class="placeholderClass" name="com_tel" />
</view> </view>
</view> </view>
<view class="btn-wrap"> <view class="btn-wrap">
<button class="btn">确认修改</button> <button class="btn" form-type="submit" disabled="{{disabled}}" loading="{{loading}}">
确认修改
</button>
</view> </view>
</form> </form>
</view> </view>
\ No newline at end of file
pages/person/editcompany/index.wxss
...@@ -47,6 +47,10 @@ ...@@ -47,6 +47,10 @@
width: 100%; width: 100%;
height: 310rpx !important; height: 310rpx !important;
} }
.company .txt .textarea-placeholder {
color: rgba(81, 85, 89, 0.5);
font-size: 28rpx;
}
.company .list { .company .list {
padding: 0 24rpx 0 0; padding: 0 24rpx 0 0;
margin-left: 24rpx; margin-left: 24rpx;
......
pages/tab/me/me.js
...@@ -109,19 +109,21 @@ Page({ ...@@ -109,19 +109,21 @@ Page({
//认证管理 //认证管理
if (e.currentTarget.dataset.type == 'certification') { if (e.currentTarget.dataset.type == 'certification') {
console.log(e.currentTarget.dataset.status)
if (e.currentTarget.dataset.status == null) { if (e.currentTarget.dataset.status == null) {
wx.navigateTo({ wx.navigateTo({
url: "/pages/person/certification/addcertification/index" url: "/pages/person/certification/addcertification/index"
}); });
} else { } else {
wx.navigateTo({ wx.navigateTo({
url: "/pages/person/certification/addcertification/index" url: "/pages/person/certification/addcertification/index"
}); });
}
} }
}
//普通跳转 //普通跳转
if (e.currentTarget.dataset.url) { if (e.currentTarget.dataset.url) {
...@@ -134,23 +136,27 @@ Page({ ...@@ -134,23 +136,27 @@ Page({
}, },
sendCustomer: function () { sendCustomer: function () {
let my = wx.getStorageSync("myUsername"); let my = wx.getStorageSync("myUsername");
let companyName = wx.getStorageSync("company_name"); let companyName = wx.getStorageSync("company_name");
let userId = wx.getStorageSync("user_id"); let userId = wx.getStorageSync("user_id");
let avatar = wx.getStorageSync("avatar"); let avatar = wx.getStorageSync("avatar");
let queryObj = { let queryObj = {
myName: my, myName: my,
your: getApp().globalData.customerNum, your: getApp().globalData.customerNum,
name: getApp().globalData.customerName, name: getApp().globalData.customerName,
name1: companyName, name1: companyName,
id: userId, id: userId,
touserid:'', touserid: '',
title: getApp().globalData.customerName, title: getApp().globalData.customerName,
img:'', img: '',
img1: avatar img1: avatar
}; };
wx.navigateTo({ wx.navigateTo({
url: "/pages/detail/chat/index?username=" + JSON.stringify(queryObj) url: "/pages/detail/chat/index?username=" + JSON.stringify(queryObj)
}) })
}, },
}) })
\ No newline at end of file
pages/tab/me/me.wxml
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<text class='t2'>金币提现兑换、领红包</text> <text class='t2'>金币提现兑换、领红包</text>
</view> </view>
<view class="bar-list boxsiz"> <view class="bar-list boxsiz">
<view class="boxsiz bar row bothSide verCenter"> <view class="boxsiz bar row bothSide verCenter" data-url="/pages/person/company/index" bind:tap="toUrl">
<view> <view>
<text class="icon iconfont iconiconcaiseshouye1"></text> <text class="icon iconfont iconiconcaiseshouye1"></text>
<text class="t1">个人主页</text> <text class="t1">个人主页</text>
......
project.config.json
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"list": [] "list": []
}, },
"miniprogram": { "miniprogram": {
"current": 20, "current": 23,
"list": [ "list": [
{ {
"id": -1, "id": -1,
...@@ -194,6 +194,27 @@ ...@@ -194,6 +194,27 @@
"id": -1, "id": -1,
"name": "pages/person/register/index", "name": "pages/person/register/index",
"pathName": "pages/person/register/index", "pathName": "pages/person/register/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/company/index",
"pathName": "pages/person/company/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/editcompany/index",
"pathName": "pages/person/editcompany/index",
"query": "",
"scene": null
},
{
"id": -1,
"name": "pages/person/auth/index",
"pathName": "pages/person/auth/index",
"scene": null "scene": null
} }
] ]
......
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