diff --git a/api/apiT.js b/api/apiT.js
index 3848275..2245e2a 100644
--- a/api/apiT.js
+++ b/api/apiT.js
@@ -1,6 +1,6 @@
- // const baseUrl = "https://api.collect.hs.hnzhwlkj.club/"; //这里放置url域名32044
-// const baseUrl = "http://192.168.0.72:8083/api/v1/"; //这里放置url域名32044
+
const baseUrl = "http://219.157.255.213:9007/"; //这里放置url域名32044
+ // const baseUrl = "http://api.crm.hnxinyouhe.com/"; //这里放置url域名32044
// const baseUrl = "http://192.168.50.4:8787/"; //这里放置url域名32044
// const baseUrl = "/api/"; //这里放置url域名32044
export function request(options){//封装的requset
@@ -17,9 +17,23 @@ export function request(options){//封装的requset
header:{'content-type': 'application/x-www-form-urlencoded','Authorization': 'Bearer ' + uni.getStorageSync('token')},
method:method||"GET",//默认请求方式是get
success: (res) => {
- resolve(res)
+ if(res.data.code==401){
+ uni.showToast({
+ title: res.data.message,
+ icon: 'none'
+ });
+ setTimeout(() => {
+ uni.reLaunch({
+ url: '/pages/login/index',// 替换为你要跳转的页面路径
+ });
+ }, 1000);
+ }else{
+ resolve(res)
+ }
},
complete: (data)=>{
+
+ console.log(data.code)
uni.hideLoading();
}
});
@@ -38,6 +52,7 @@ export function requestx(options){//封装的requset
resolve(res)
},
complete: (data)=>{
+
}
});
})
diff --git a/common/locales/en.js b/common/locales/en.js
index b0f287e..a4b97bb 100644
--- a/common/locales/en.js
+++ b/common/locales/en.js
@@ -30,6 +30,7 @@ export default {
followtype:'Follow up method',
Online:'On line',
Visit:'Visit',
+ addfollow:'follow up',
followtime:'Follow up time',
updataimg:'Upload follow-up chat screenshot',
followrecord:'Follow up records',
@@ -136,7 +137,14 @@ export default {
newpassword:'Password',
Confirmpassword:'Confirm password',
Confirmbtn:'Confirm modification',
+ edtbtn:'edit',
zh:'Chinese',
en:'English',
- ru:'Russian'
+ ru:'Russian',
+ subsuccess:'Successful',
+ onedaygj:'1 day later',
+ threedaygj:'3 day later',
+ sevendaygj:'7 day later',
+ autodaygj:'Customize',
+ nexttime:'Next follow-up reminder setting',
}
\ No newline at end of file
diff --git a/common/locales/zh.js b/common/locales/zh.js
index 11a9a90..a150b0f 100644
--- a/common/locales/zh.js
+++ b/common/locales/zh.js
@@ -29,6 +29,7 @@ export default {
followtype:'跟进方式',
Online:'在线跟进',
Visit:'拜访',
+ addfollow:'添加跟进',
followtime:'跟进时间',
updataimg:'上传跟进最后聊天截图',
followrecord:'跟进记录',
@@ -135,7 +136,14 @@ export default {
newpassword:'新密码',
Confirmpassword:'确认密码',
Confirmbtn:'确认修改',
+ edtbtn:'编辑资料',
zh:'中文',
en:'英语',
- ru:'俄语'
+ ru:'俄语',
+ subsuccess:'提交成功',
+ onedaygj:'1天后',
+ threedaygj:'3天后',
+ sevendaygj:'7天后',
+ autodaygj:'自定义',
+ nexttime:'下次跟进提醒设置',
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 606caba..bd7f493 100644
--- a/pages.json
+++ b/pages.json
@@ -22,7 +22,7 @@
"style" :
{
"navigationBarTitleText": "首页",
- "enablePullDownRefresh": true,
+ "enablePullDownRefresh": false,
"navigationStyle":"custom",// 去掉微信小程序顶部导航
"app-plus":{
"titleNView":false //去掉app+h5顶部导航
@@ -46,7 +46,7 @@
"path" : "pages/login/agreement",
"style" :
{
- "navigationBarTitleText" : "隐私政策",
+ "navigationBarTitleText" : "用户协议",
"enablePullDownRefresh": false,
"navigationStyle":"custom"// 去掉微信小程序顶部导航
}
@@ -55,7 +55,9 @@
"path" : "pages/login/agreementuser",
"style" :
{
- "navigationBarTitleText" : "用户服务协议"
+ "navigationBarTitleText" : "隐私协议",
+ "enablePullDownRefresh": false,
+ "navigationStyle":"custom"// 去掉微信小程序顶部导航
}
},
{
@@ -99,6 +101,15 @@
"navigationStyle":"custom"// 去掉微信小程序顶部导航
}
},
+ {
+ "path" : "editdetile",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh": false,
+ "navigationStyle":"custom"// 去掉微信小程序顶部导航
+ }
+ },
{
"path" : "followup",
"style" :
@@ -125,6 +136,15 @@
"enablePullDownRefresh": false,
"navigationStyle":"custom"// 去掉微信小程序顶部导航
}
+ },
+ {
+ "path" : "followsuccess",
+ "style" :
+ {
+ "navigationBarTitleText" : "",
+ "enablePullDownRefresh": false,
+ "navigationStyle":"custom"// 去掉微信小程序顶部导航
+ }
}
]
},{
diff --git a/pages/customer/add.vue b/pages/customer/add.vue
index 7d470db..3a07f4b 100644
--- a/pages/customer/add.vue
+++ b/pages/customer/add.vue
@@ -205,13 +205,16 @@
url: '/pages/customer/maph5'
});
// #endif
-
// #ifdef APP-PLUS
uni.navigateTo({
url: '/pages/customer/map'
});
// #endif
-
+ },
+ gomap1(){
+ uni.navigateTo({
+ url: '/pages/customer/map'
+ });
},
mapclose(){
this.showmap = false
diff --git a/pages/customer/detile.vue b/pages/customer/detile.vue
index 51d6a78..d11601a 100644
--- a/pages/customer/detile.vue
+++ b/pages/customer/detile.vue
@@ -2,72 +2,31 @@
-
- {{$t('customer.CustomerChannel')}}
-
-
- {{channel_name || $t('customer.CustomerChannelinput')}}
-
+
+
+ {{datas.contacts}}
+
+ {{datas.magnitude_txt}}
+ {{datas.follow_txt}}
+
+
+
+
+
+ {{datas.phone}}
+ 渠道：{{datas.channel_name}}
+
+ {{datas.sex_txt}} | {{datas.country_name}}{{datas.car_type_name}}
+
+ Email: {{datas.email}}
+ WhatsAPP: {{datas.WhatsApp}}
+ 公司: {{datas.address}}
+ 备注: {{datas.describe}}
+
+
+ {{$t('edtbtn')}}
-
-
- {{$t('customer.Medal')}}
-
-
- {{magnitude_name || $t('customer.Medalinput')}}
-
-
-
-
-
- {{$t('customer.CustomerName')}} *
-
-
-
-
-
-
- {{$t('gender')}}
-
-
- {{$t('gender0')}}
- {{$t('gender1')}}
- {{$t('gender2')}}
-
-
-
-
-
- {{$t('mine.lxcall')}} *
-
-
-
-
-
-
- Email
-
-
-
-
-
-
- WhatsApp
-
-
-
-
-
-
- {{$t('customer.Customerph')}}
-
-
- {{car_type_name || $t('customer.Customerphinput')}}
-
-
-
-
{{$t('customer.Cstomerfj')}}
@@ -76,31 +35,6 @@
-
-
- {{$t('customer.Country')}}
-
-
- {{country_name || $t('customer.Countryinput')}}
-
-
-
-
-
- {{$t('customer.Company')}}
-
-
- {{address || $t('customer.Companyinput')}}
-
-
-
-
-
- {{$t('customer.Remarks')}}
-
-
-
-
@@ -141,14 +75,10 @@
-
+
+
+
+ {{$t('customer.Medal')}}
+
+
+ {{magnitude_name || $t('customer.Medalinput')}}
+
+
+
+
+
+ {{$t('customer.CustomerName')}} *
+
+
+
+
+
+
+ {{$t('gender')}}
+
+
+ {{$t('gender0')}}
+ {{$t('gender1')}}
+ {{$t('gender2')}}
+
+
+
+
+
+ {{$t('mine.lxcall')}} *
+
+
+
+
+
+
+ Email
+
+
+
+
+
+
+ WhatsApp
+
+
+
+
+
+
+ {{$t('customer.Customerph')}}
+
+
+ {{car_type_name || $t('customer.Customerphinput')}}
+
+
+
+
+
+
+ {{$t('customer.Country')}}
+
+
+ {{country_name || $t('customer.Countryinput')}}
+
+
+
+
+
+ {{$t('customer.Company')}}
+
+
+ {{form.address || $t('customer.Companyinput')}}
+
+
+
+
+
+ {{$t('customer.Remarks')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/customer/followsuccess.vue b/pages/customer/followsuccess.vue
new file mode 100644
index 0000000..c784d4a
--- /dev/null
+++ b/pages/customer/followsuccess.vue
@@ -0,0 +1,201 @@
+
+
+
+
+
+ {{$t('subsuccess')}}
+
+
+
+
+ {{$t('nexttime')}}
+
+
+
+
+ {{$t('onedaygj')}}
+
+
+
+
+ {{$t('threedaygj')}}
+
+
+
+
+ {{$t('sevendaygj')}}
+
+
+
+
+
+
+ {{time || $t('autodaygj')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/customer/followup.vue b/pages/customer/followup.vue
index d53c4e5..d748ecc 100644
--- a/pages/customer/followup.vue
+++ b/pages/customer/followup.vue
@@ -1,6 +1,36 @@
+
+
+ {{userdatas.contacts}}
+
+ {{userdatas.magnitude_txt}}
+ {{userdatas.follow_txt}}
+
+
+
+
+
+ {{userdatas.phone}}
+ 渠道：{{userdatas.channel_name}}
+
+ {{userdatas.sex_txt}} | {{userdatas.country_name}}{{userdatas.car_type_name}}
+
+ Email: {{userdatas.email}}
+ WhatsAPP: {{userdatas.WhatsApp}}
+ 公司: {{userdatas.address}}
+ 备注: {{userdatas.describe}}
+
+
+
+ {{$t('customer.Cstomerfj')}}
+
+ {{grade_name || $t('customer.Cstomerfjinput')}}
+
+
+
+
{{$t('customer.followtype')}}
@@ -49,7 +79,7 @@
{{$t('customer.Visitcontent')}}
-
+
@@ -96,17 +126,19 @@
+
+
{
+ if(item.id == that.userdatas.grade){
+ that.grade_name = item.name
+ that.defaultIndexfj=[index]
+ }
+ })
+ },
+ //客户等级
+ getGrade(){
+ request({
+ url:'customer/getGrade',
+ method:'get',
+ }).then(res => {
+ var list = res.data.data
+ this.getGradeList = [list]
+ this.getGradeList1 = list
+ // this.selectgd()
+ })
+ },
+ //客户等级切换事件
+ gradeHandler(val){
+ this.grade = val.value[0].id
+ this.grade_name = val.value[0].name
+ this.showgrade = false
+ request({
+ url:'customer/grade',
+ method:'post',
+ data:{
+ id:this.id,
+ grade:this.grade
+ }
+ }).then(res => {
+ uni.showToast({
+ title: res.data.message,
+ icon: 'none'
+ });
+ })
+ },
+ cancel(val){
+ this[val] = false
+ },
+ close(val){
+ this[val] = false
+ },
+ //客户详情
+ customerdetailfn(){
+ var that=this;
+ request({
+ url:'customer/detail',
+ method:'get',
+ data: {
+ id:this.id,
+ }
+ }).then(res => {
+ that.userdatas = res.data.data
+ that.selectgd()
+ })
+ },
// 获取当前位置
getarrd(longitude,latitude){
const apiKey = 'AIzaSyBGvV-vX7C72PEbcYrTdmUj3qrubejWzNw';
@@ -227,6 +328,7 @@
},
//保存跟进
nextFn(){
+
request({
url:'follow/save',
method:'post',
@@ -238,7 +340,9 @@
});
if(res.data.code ==0){
setTimeout(() => {
- uni.navigateBack({})
+ uni.navigateTo({
+ url: '/pages/customer/followsuccess?id='+this.id
+ });
}, 1000);
}
})
@@ -258,9 +362,6 @@
return ''
}
},
- cancel() {
- this.show = false
- },
confirm(e) {
this.show = false
this.form.firstFollowtime = this.result(e.value, e.mode)
@@ -304,7 +405,8 @@
uploadfn(imgUrl,name){
var that = this;
uni.uploadFile({
- url: 'http://219.157.255.213:9007/upload',
+ // url: 'http://api.crm.hnxinyouhe.com/upload',
+ url: 'http://219.157.255.213:9007',
filePath: imgUrl,
name: 'files',
header:{'content-type': 'application/x-www-form-urlencoded','Authorization': 'Bearer ' + uni.getStorageSync('token')},
@@ -414,10 +516,104 @@
.u-divider{
margin: 0px 0px !important;
}
+ .contents{
+ background-color:#F6F6F6;
+ border-radius: 10px;
+ margin: 0px 15px 10px;
+ .edt{
+ display: flex;
+ justify-content: center;
+ }
+ .btn{
+ background: linear-gradient(to right, #3471FF, #6776FF);
+ color: white;
+ text-align: center;
+ border-radius: 20px;
+ width: 100px;
+ margin-bottom: 10px;
+ padding: 4px 0px;
+ }
+ .top{
+ padding: 10px 15px 0px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ .tag{
+ color: white;
+ border-radius: 20px 0px 0px 20px;
+ padding: 3px 10px;
+ margin-right: -15px;
+ }
+ .right{
+ display: flex;
+ align-items: center;
+ .medal{
+ margin-right: 10px;
+ }
+ }
+ }
+ .name{
+ font-size: 32rpx;
+ font-weight: bold;
+ margin-right: 10px;
+ }
+ .cont{
+ padding: 0px 15px 10px;
+ font-size: 24rpx;
+
+ .title{
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ color: #222222;
+ }
+ .ststus{
+ color: #666666;
+ }
+ .info,.desc{
+ color: #78758E;
+ line-height: 26px;
+ }
+ .sex{
+ margin-right: 5px;
+ }
+ .addr{
+ margin-left: 5px;
+ }
+ .type{
+ margin-left: 5px;
+ color: #3471FF;
+ }
+ }
+ }
.content{
padding-top: 10px;
background: #FFFFFF;
// height: calc(100vh - 44px);
+
+ }
+ .cell2{
+ position: relative;
+ display: flex;
+ justify-content:space-between;
+ padding: 18px 20px;
+ align-items: center;
+ font-weight: 500;
+ margin: 0px 15px 10px;
+ .item{
+ width: 90px;
+ color: #666666;
+ }
+ background: #f6f6f6;
+ border-radius: 10px;
+ .right{
+ text-align: right;
+ }
+ .select{
+ display: flex;
+ position: relative;
+ margin-right: 10px;
+ }
}
.cell{
position: relative;
@@ -462,7 +658,7 @@
background: linear-gradient(to right, #3471FF, #6776FF);
color: white;
border-radius: 50px;
- width: 45%;
+ width: 93%;
height: 96rpx;
line-height: 96rpx;
margin-top: 20px;
diff --git a/pages/customer/maph5.vue b/pages/customer/maph5.vue
index 1949cee..9bdacf5 100644
--- a/pages/customer/maph5.vue
+++ b/pages/customer/maph5.vue
@@ -2,9 +2,18 @@
-
-
- 确定
+
+
+ 确定
+
+
+
+
+
+ {{item.structured_formatting.main_text}}
+ {{item.structured_formatting.secondary_text}}
+
+
@@ -12,13 +21,17 @@
import { Loader } from "@googlemaps/js-api-loader";
const loader = new Loader({
// google服务的KEY
- apiKey: "AIzaSyBGvV-vX7C72PEbcYrTdmUj3qrubejWzNw",
+ apiKey: "AIzaSyCiQdUlA2QrEBEaZthoj7B18HTz6sxU_3I",
version: "weekly",
libraries: ["places"]
});
export default {
data() {
return {
+ map:'',
+ value: '',
+ // 模糊匹配数据
+ list: [],
cityInfo:{
lat: '',
lng: '',
@@ -36,6 +49,50 @@ export default {
this.initMap()
},
methods:{
+ nextfn(){
+ uni.setStorageSync('location',JSON.stringify(this.cityInfo));
+ uni.navigateBack({})
+ },
+ // 模糊查询地址
+ getPlacesList() {
+ var that = this
+ var text = this.value
+ return new Promise(async(resolve, reject) => {
+ if (!text){
+ that.list = []
+ resolve([])
+ }
+ const autocomplete = new google.maps.places.AutocompleteService();
+ autocomplete.getPlacePredictions({ input: text }, function(predictions, status) {
+ that.list = predictions
+ });
+ });
+ },
+ confirm(item){
+ var that = this
+ // var latlng = JSON.parse(JSON.stringify(place.geometry.location))
+ console.log("place===", item.description)
+ that.value = item.description
+ that.cityInfo.address=item.description
+ var geocoder = new google.maps.Geocoder();
+ // var address = document.getElementById("address").value;
+ geocoder.geocode( { 'address': item.description}, function(results, status) {
+ console.log(results)
+ var latlng = JSON.parse(JSON.stringify(results[0].geometry.location))
+ console.log(latlng)
+ // // 将地图中心点指向用户所选位置，并设置标记
+ that.map.setCenter(latlng);
+ that.cityInfo.lat=latlng.lat
+ that.cityInfo.lng=latlng.lng
+ var searchmarker = new google.maps.Marker({
+ map: that.map,
+ position: results[0].geometry.location,
+ title: results[0].formatted_address
+ });
+
+ });
+ that.list =[]
+ },
initMap() {
var that = this
loader
@@ -45,7 +102,7 @@ export default {
type: 'wgs84', // 默认为 wgs84 坐标系，可选 gcj02
success: function (res) {
console.log(res)
- const map = new google.maps.Map(document.getElementById("map"),
+ that.map = new google.maps.Map(document.getElementById("map"),
{
center: { lat:res.latitude, lng: res.longitude},
zoom: 12,// 地图缩放参数
@@ -56,7 +113,7 @@ export default {
)
var marker = new google.maps.Marker({
position: { lat:res.latitude, lng: res.longitude},
- map: map,
+ map: that.map,
draggable: true, // 允许拖动标记
icon: {
url: 'https://now.guua.com/attachs/default/location_shop.png',
@@ -68,7 +125,7 @@ export default {
// 监听标记拖动事件
marker.addListener('dragend', () => {
const position = marker.getPosition();
- map.setCenter(position);
+ that.map.setCenter(position);
// 根据标记位置获取地址信息
const geocoder = new google.maps.Geocoder();
geocoder.geocode({ location: position }, (results, status) => {
@@ -78,12 +135,8 @@ export default {
that.cityInfo.address = results[0].formatted_address;
that.cityInfo.lat = position.lat();
that.cityInfo.lng = position.lng();
- console.log(that.cityInfo)
- // cityInfo.address = results[0].formatted_address;
- // updateInfo({
- // formatted_address: results[0].formatted_address,
- // geometry: { location: position },
- // });
+ that.value = results[0].formatted_address;
+ console.log(that.cityInfo)
} else {
alert('无法获取地址信息');
}
@@ -102,121 +155,39 @@ export default {
.catch((e) => {
console.log(e)
})
- },
- ListeningInputBox() {
- // 创建 Autocomplete 实例
- const input = document.getElementById("search-box");
- const autocomplete = new google.maps.places.AutocompleteService();
- // 设置 Autocomplete 参数
- // autocomplete.setFields(["geometry", "name"]);
- // 添加事件监听器，当用户选择某个地点时，在地图上标记出所选位置
- // LoadAnimation(true)
- autocomplete.getPlacePredictions(this.cityInfo.address, function() {
- const place = autocomplete.getPlace();
- var latlng = JSON.parse(JSON.stringify(place.geometry.location))
- console.log("place===", latlng)
- getAddress(latlng.lat, latlng.lng);
- if (!place.geometry) {
- console.log("返回的地理信息无效！");
- return;
- }
- // 将地图中心点指向用户所选位置，并设置标记
- if (searchmarker) { //去除marker标记点
- searchmarker.setMap(null)
- searchmarker = ""
- }
- map.setCenter(place.geometry.location);
- searchmarker = new google.maps.Marker({
- map: map,
- position: place.geometry.location,
- title: place.name,
- });
- });
- },
- getAddress(latitude, longitude) {
- var that=this
- // 根据经纬度发起 Reverse Geocoding API 请求，获取地址信息
- var geocoder = new google.maps.Geocoder();
- var latlng = {
- lat: latitude,
- lng: longitude
- };
- this.cityInfo.lats = latitude
- this.cityInfo.lng = longitude
- geocoder.geocode({
- location: latlng
- }, function(results, status) {
- if (status === 'OK') {
- if (results[0]) {
- console.log(results[0])
- for (var i = 0; i < results.length; i++) {
- var components = results[i].address_components;
- for (var j = 0; j < components.length; j++) {
- var component = components[j];
- if (component.types.includes("country")) {
- console.log("国家: ====>" + component.long_name);
- cityInfo.country = component.long_name || '暂无';
- } else if (component.types.includes("administrative_area_level_1")) {
- console.log("省/州: ====>" + component.long_name);
- cityInfo.province = component.long_name || '暂无';
- } else if (component.types.includes("locality")) {
- console.log("城市: ====> " + component.long_name);
- cityInfo.city = component.long_name || '暂无';
- } else if (component.types.includes("sublocality_level_1")) {
- console.log("区/县: ====>" + component.long_name);
- cityInfo.district = component.long_name || '暂无';
- } else if (component.types.includes("route")) {
- console.log("路/街道名: ====> " + component.long_name);
- cityInfo.street = component.long_name || '暂无';
- } else if (component.types.includes("street_number")) {
- console.log("门牌号: ====> " + component.long_name);
- cityInfo.door = component.long_name || '暂无';
- }
- }
- }
- that.cityInfo.address = results[0].formatted_address;
- console.log("cityInfo==========", that.cityInfo)
-
- // addInfo(cityInfo)
-
- } else {
- alert('找不到地址信息');
- }
- } else {
- alert('获取地址信息失败：' + status);
- }
- });
}
},
}
diff --git a/pages/index/customer.vue b/pages/index/customer.vue
index 570ff69..5c81684 100644
--- a/pages/index/customer.vue
+++ b/pages/index/customer.vue
@@ -3,7 +3,9 @@
- {{$t('customer.title')}}
+
+
+
@@ -16,37 +18,43 @@
+
+
+
-
-
-
-
- {{item.created_at}}
-
- {{item.magnitude_txt}}
- {{item.follow_txt}}
+
+
+
+
+
+ {{item.created_at}}
+
+ {{item.magnitude_txt}}
+ {{item.follow_txt}}
+
+
+
+
+
+ {{item.contacts}}{{item.phone}}
+ {{item.grade_txt}}
+
+ {{item.sex_txt}} | {{item.country_name}}{{item.car_type_name}}
+
+
+
+
+ {{$t('call')}}
+ {{$t('customer.addfollow')}}
+
-
-
-
- {{item.contacts}}{{item.phone}}
- {{item.grade_txt}}
-
- {{item.sex_txt}} | {{item.country_name}}{{item.car_type_name}}
-
-
-
-
- {{$t('call')}}
- {{$t('followup')}}
- {{$t('delete')}}
-
-
+
+
-
+
@@ -84,7 +88,7 @@
}
},
onLoad() {
-
+ this.userinfo =JSON.parse(uni.getStorageSync('userinfo'))
},
onShow() {
},
@@ -122,6 +126,13 @@
},
});
},
+ //退出登录
+ logout(){
+ uni.clearStorageSync();
+ uni.reLaunch({
+ url: '/pages/login/index',// 替换为你要跳转的页面路径
+ });
+ }
}
}
@@ -148,19 +159,17 @@
background-repeat: no-repeat;
}
.navbar{
- padding-top: 30px;
- height: 50px;
- line-height: 50px;
- text-align: center;
- color: #fff;
- font-size: 32rpx;
+ /* #ifdef APP-PLUS */
+ height:44px;
+ /* #endif */
+ height:30px;
}
.content{
padding:10px 15px 15px;
.contop{
display: flex;
align-items: center;
- margin: 15px 0px 30px;
+ margin: 0px 0px 30px;
font-size: 34rpx;
color: white;
.right{
@@ -198,7 +207,6 @@
height: 220rpx;
}
.bottomCon {
- margin-top: 40rpx;
color: #000;
font-weight: 400;
// padding: 0 24rpx 20rpx;
diff --git a/pages/login/index.vue b/pages/login/index.vue
index f31f386..6c42095 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -10,7 +10,13 @@
-
+
+
{
console.log(res.data.data)
@@ -179,10 +196,11 @@
uni.showToast({
title: res.data.message,
icon: 'none'
- });token
+ });
} else if (res.data.code == 0) {
//存取session
+ uni.setStorageSync('userinfo',JSON.stringify(res.data.data));
uni.setStorageSync('token', res.data.data.token);
//返回数据接收成功
uni.reLaunch({
diff --git a/pages/login/register.vue b/pages/login/register.vue
index 382b1ec..0e1c0a1 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -1,5 +1,8 @@
+
+
+
@@ -158,7 +161,14 @@
display: flex;
flex-direction: column;
justify-content: space-between;
-
+ .leftback{
+ position: fixed;
+ /* #ifdef APP-PLUS/
+ top: 44px;
+ /* #endif */
+ top: 30px;
+ left: 15px;
+ }
.title {
padding-top: 220rpx;
text-align: center;
diff --git a/static/image/change1.png b/static/image/change1.png
new file mode 100644
index 0000000..cce9b0e
Binary files /dev/null and b/static/image/change1.png differ
diff --git a/static/image/customer/success.png b/static/image/customer/success.png
new file mode 100644
index 0000000..45a6310
Binary files /dev/null and b/static/image/customer/success.png differ
diff --git a/static/image/mine/bg.png b/static/image/mine/bg.png
index 2ab32bd..0a66663 100644
Binary files a/static/image/mine/bg.png and b/static/image/mine/bg.png differ