yangjie
/
high-mini
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.对接H5接口

Browse Source 
2.优化H5打包
yj-dev
杨杰 3 years ago
parent 939d6656c8
commit 9b8964f50b
13 changed files with 365 additions and 363 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 13
      Utils/Api.js
  2. 15
      components/Authorize.vue
  3. 6
      manifest.json
  4. 118
      pages/goods/externalCoupon/externalCoupon.vue
  5. 210
      pages/goods/goods.vue
  6. 56
      pages/goods/store-list/store-details.vue
  7. 223
      pages/login/register.vue
  8. 46
      pages/order/confirmation.vue
  9. 8
      pages/tabBar/category/category.vue
  10. 10
      pages/tabBar/home/home.vue
  11. 2
      pages/tabBar/user/user.vue
  12. 3
      pages/user/order_list/order_list.vue
  13. BIN
      static/img/share/wxd.png

13
Utils/Api.js
Unescape View File

@ -139,7 +139,18 @@ export const getStoreList = params => {
export const getH5UserInfo = params => {
return POST('GET', `${base}/wechat/getH5UserInfo`, params).then(res => res.data);
}
//获取验证码
export const sendSmsCode = params => {
return POST('GET', `${base}/sms/sendSmsCode`, params).then(res => res.data);
}
//绑定手机号
export const bindUserPhone = params => {
return POST('GET', `${base}/highUser/bindUserPhone`, params).then(res => res.data);
}
//注册
export const H5login = params => {
return POST('GET', `${base}/user/login`, params).then(res => res.data);
}
//**门店//
export const userLogin = params => {

15
components/Authorize.vue
Unescape View File

@ -50,7 +50,6 @@
methods: {
iscode() {
let that = this;
if (!app.globalData.userInfo) {
this.isShowAuth = true;
} else {}
@ -106,29 +105,17 @@
});
},
fail: res => {
console.log('========' + JSON.stringify(res));
uni.showToast({
title: "微信登录授权失败",
icon: "none"
});
}
})
// } else {
// fail: res => {
// uni.showToast({
// title: "微信登录授权失败",
// icon: "none"
// });
// }
// }
// }
// })
that.isShowAuth = false
},
getH5userinfo(){
uni.navigateTo({
url:'/pages/login/register'
url:'/pages/login/register?id=1'
})
// location.href='https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_userinfo#wechat_redirect';
},

6
manifest.json
Unescape View File

@ -82,12 +82,12 @@
},
"title" : "嗨森逛",
"router" : {
"mode" : "",
"base" : ""
"mode" : "hash",
"base" : "/H5"
},
"devServer" : {
"port" : "",
"https" : false
"https" : true
},
"domain" : "https://hsgcs.dctpay.com",
"template" : ""

118
pages/goods/externalCoupon/externalCoupon.vue
Unescape View File

@ -14,8 +14,8 @@
</view>
</view>
<view class="line1 mart15"></view>
<button class="coupne-btn width60w mart20 marb20" v-if="userInfo == 1" lang="zh_CN"
@click="getuserinfo" withCredentials="true">点击领取</button>
<button class="coupne-btn width60w mart20 marb20" v-if="userInfo == 1" lang="zh_CN" @click="getuserinfo"
withCredentials="true">点击领取</button>
<button class="coupne-btn width60w mart20 marb20" v-else @click="receiveDiscount">点击领取</button>
<view class="width90 mart10 fcor666">去使用</view>
<view v-if="minecoupones == '' " class="mart60 fotct font14 fcor666">
@ -188,58 +188,67 @@
getuserinfo() {
let that = this;
// wx.login({
// success(res) {
// if (res.code) {
//发起网络请求
// var code = res.code
// 获取微信用户信息
uni.getUserProfile({
desc: '登录中...',
success: function(res) {
let params = {
openId: app.globalData.openId,
iv: res.iv,
encryptedData: res.encryptedData
}
getUserInfo(params).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();
app.globalData.userInfo = res
.return_data
.object
.highUser;
app.globalData.token = res
.return_data.uniqueCode;
uni.setStorage({
key: "user",
data: res.return_data
.object
.highUser
})
uni.setStorage({
key: "token",
data: res.return_data
.uniqueCode
})
that.receiveDiscount();
that.userInfo = 2;
} else {
uni.hideLoading();
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
});
},
fail: res => {
uni.showToast({
title: "微信登录授权失败",
icon: "none"
});
}
})
// success(res) {
// if (res.code) {
// 发起网络请求
// var code = res.code;
// 获取微信用户信息
uni.getUserProfile({
desc: '登录中...',
success: function(res) {
let params = {
openId: app.globalData.openId,
iv: res.iv,
encryptedData: res.encryptedData
}
getUserInfo(params).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();
app.globalData.userInfo = res
.return_data
.object
.highUser;
app.globalData.token = res
.return_data.uniqueCode;
uni.setStorage({
key: "user",
data: res.return_data
.object
.highUser
})
uni.setStorage({
key: "token",
data: res.return_data
.uniqueCode
})
that.receiveDiscount();
that.userInfo = 2;
} else {
uni.hideLoading();
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
});
},
fail: res => {
uni.showToast({
title: "微信登录授权失败",
icon: "none"
});
}
})
// } else {
// uni.showToast({
// title: "微信登录授权失败",
// icon: "none"
// });
// }
// }
// })
},
//商品跳转
toGoods(e) {
@ -261,7 +270,6 @@
</script>
<style lang="scss">
.coupon-mes {
// margin-right: 90px;
}

210
pages/goods/goods.vue
Unescape View File

@ -1,14 +1,16 @@
<template>
<view>
<!-- #ifdef H5 -->
<view class="header">
<!-- 头部-默认显示 -->
<view class="before" :style="{ opacity: 1 - afterHeaderOpacity, zIndex: beforeHeaderzIndex }">
<view class="back"><view class="icon xiangqian" @tap="back" v-if="showBack"></view></view>
<view class="back">
<view class="icon xiangqian" @tap="back" v-if="showBack"></view>
</view>
<view class="middle"></view>
</view>
</view>
<!-- #endif -->
<!-- 底部菜单 -->
<view class="footer">
<button v-if="user == '' " class="width100 fotct btnfot" @click="getuserinfo">
@ -95,11 +97,14 @@
<view class="description">
<view class="title">———— 商品详情 ————</view>
<view class="content marb65">
<image mode="widthFix" class="width100" v-for="codes in couponDesc" :key="codes" :src="imageUrl+codes" @click="perImage(codes)">
<image mode="widthFix" class="width100" v-for="codes in couponDesc" :key="codes" :src="imageUrl+codes"
@click="perImage(codes)">
</image>
</view>
</view>
<!-- <authorize></authorize> -->
<!-- #ifdef H5 -->
<authorize></authorize>
<!-- #endif -->
</view>
</template>
@ -109,12 +114,12 @@
GetPhoneNumber,
getUserInfo
} from "../../Utils/Api.js";
// import authorize from '../../components/Authorize.vue'
import authorize from '../../components/Authorize.vue'
let app = getApp()
export default {
// components: {
// authorize
// },
components: {
authorize
},
data() {
return {
//控制渐变标题栏的参数
@ -201,21 +206,11 @@
//查看大图
perImage(item) {
uni.previewImage({
current: 0, //预览图片的下标
urls: [this.imageUrl+item] //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
current: 0, //预览图片的下标
urls: [this.imageUrl + item] //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
})
},
//商品跳转
// toGoods(e) {
// console.log('=========='+e);
// // uni.showToast({
// // title: '商品' + e.goods_id,
// // icon: 'none'
// // });
// uni.navigateTo({
// url: 'goods'
// });
// },
/**
* 跳转门店详情
*/
@ -234,12 +229,7 @@
url: '../msg/msg'
})
},
// 客服
toChat() {
// uni.navigateTo({
// url:"../msg/chat/chat?name=客服008"
// })
},
// 分享
share() {
this.shareClass = 'show';
@ -267,46 +257,6 @@
title: "已加入购物车"
});
},
//立即购买
// getPhoneNumber(PhoneNumber) {
// let params = {
// openId: app.globalData.openId,
// iv: PhoneNumber.detail.iv,
// encryptedData: PhoneNumber.detail.encryptedData
// }
// GetPhoneNumber(params).then(res => {
// if (res.return_code == '000000') {
// app.globalData.userInfo = res.return_data
// .object
// .highUser;
// uni.setStorage({
// key: "user",
// data: res.return_data
// .object
// .highUser
// })
// let that = this;
// if (that.goodsData[0].stockCount) {
// uni.showToast({
// title: '提交订单...',
// icon: 'none',
// duration: 2000,
// success() {
// uni.navigateTo({
// url: '../order/confirmation?id=' + that.goodsData[0].id
// })
// }
// })
// } else {
// uni.showToast({
// title: '卡券数量不足',
// icon: 'none',
// duration: 2000
// })
// }
// }
// });
// },
//获取登陆信息
getuserinfo() {
// uni.showLoading({
@ -314,70 +264,65 @@
// });
let that = this;
// wx.login({
// success(res) {
// if (res.code) {
//发起网络请求
// var code = res.code
// 获取微信用户信息
uni.getUserProfile({
desc: '登录中...',
success: function(res) {
let params = {
openId: app.globalData.openId,
iv: res.iv,
encryptedData: res.encryptedData
}
getUserInfo(params).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();
app.globalData.userInfo = res
.return_data
.object
.highUser;
app.globalData.token = res
.return_data.uniqueCode;
uni.setStorage({
key: "user",
data: res.return_data
.object
.highUser
})
uni.setStorage({
key: "token",
data: res.return_data
.uniqueCode
})
that.buy();
} else {
uni.hideLoading();
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
});
},
fail: res => {
uni.hideLoading();
uni.showToast({
title: "微信登录授权失败",
icon: "none"
});
}
})
// success(res) {
// if (res.code) {
//发起网络请求
// var code = res.code;
// 获取微信用户信息
uni.getUserProfile({
desc: '登录中...',
success: function(res) {
let params = {
openId: app.globalData.openId,
iv: res.iv,
encryptedData: res.encryptedData
}
getUserInfo(params).then(res => {
if (res.return_code == '000000') {
uni.hideLoading();
that.user = res.return_data.object.highUser;
app.globalData.userInfo = res
.return_data
.object
.highUser;
app.globalData.token = res
.return_data.uniqueCode;
uni.setStorage({
key: "user",
data: res.return_data
.object
.highUser
})
uni.setStorage({
key: "token",
data: res.return_data
.uniqueCode
})
that.buy();
} else {
uni.hideLoading();
uni.showToast({
title: res.return_msg,
icon: 'none',
duration: 2000
})
}
});
},
fail: res => {
uni.hideLoading();
uni.showToast({
title: "微信登录授权失败",
icon: "none"
});
}
})
// } else {
// fail: res => {
// uni.showToast({
// title: "微信登录授权失败",
// icon: "none"
// });
// }
// uni.showToast({
// title: "微信登录授权失败",
// icon: "none"
// });
// }
// },
// fail(res) {
// uni.hideLoading();
// }
// })
@ -785,9 +730,11 @@
position: relative;
width: 100%;
height: 100vw;
swiper {
width: 100%;
height: 100vw;
swiper-item {
image {
width: 100%;
@ -795,7 +742,8 @@
}
}
}
.indicator{
.indicator {
display: flex;
justify-content: center;
align-items: center;

56
pages/goods/store-list/store-details.vue
Unescape View File

@ -28,7 +28,7 @@
点击授权查询个人卡券
</button>
<view class="width90 store-list mart10" v-for="mers in menCoupnList" :key="mers.id">
<view class="width90 store-list mart10" v-for="mers in menCoupnList" :key="mers.id">
<view class="width100" style="height: 55px;">
<view class="flleft width70">
<view class="width90 fcor333 font15 mart5">{{mers.highCouponModel.couponName}}</view>
@ -38,12 +38,13 @@
</view>
<view class="width90">
<button class="store-jdes flleft mart5" @click="jumpCoupondes(mers.id,mers.highCouponModel.id)">查看详情</button>
<button class="store-jdes flleft mart5"
@click="jumpCoupondes(mers.id,mers.highCouponModel.id)">查看详情</button>
</view>
</view>
<view class="loading-text" v-if="productList != '' ">{{ loadingText }}</view>
<!-- <authorize></authorize> -->
<authorize></authorize>
</view>
</template>
@ -53,12 +54,12 @@
getCouponListByStoreId,
getUserInfo
} from '../../../Utils/Api.js';
// import authorize from '../../../components/Authorize';
import authorize from '../../../components/Authorize';
let app = getApp();
export default {
// components: {
// authorize
// },
components: {
authorize
},
data() {
return {
imageUrl: app.globalData.imgUrl,
@ -96,8 +97,7 @@
this.merchanId = option.id;
this.distance = option.juli;
this.getMerchantStoreById();
if (!this.user) {
} else {
if (!this.user) {} else {
this.getCouponListByStoreId();
}
@ -113,10 +113,10 @@
// });
let that = this;
// wx.login({
// success(res) {
// if (res.code) {
//发起网络请求
// var code = res.code
// success(res) {
// if (res.code) {
// // 发起网络请求
// var code = res.code;
// 获取微信用户信息
uni.getUserProfile({
desc: '登录中...',
@ -166,21 +166,23 @@
});
}
})
// } else {
// fail: res => {
// uni.showToast({
// title: "微信登录授权失败",
// icon: "none"
// });
// }
// uni.showToast({
// title: "微信登录授权失败",
// icon: "none"
// });
// }
// },
// fail(res) {
// uni.hideLoading();
// }
// },
// fail(res) {
// uni.hideLoading();
// }
// })
// }
// })
},
//查询门店详情
getMerchantStoreById() {
@ -200,9 +202,9 @@
})
},
// 跳转卡券详情
jumpCoupondes(e,item) {
jumpCoupondes(e, item) {
uni.navigateTo({
url: '../coupon-details/coupon-details?id='+e +'&mendId='+item
url: '../coupon-details/coupon-details?id=' + e + '&mendId=' + item
})
},
//前往导航
@ -236,7 +238,7 @@
uni.hideLoading();
this.isNoMoreData = res.return_data.list.length == this.pageSize ? false : true;
this.menCoupnList = this.menCoupnList.concat(res.return_data.list);
if(res.return_data.total == (this.pageNum * this.pageSize)){
if (res.return_data.total == (this.pageNum * this.pageSize)) {
this.isNoMoreData = true;
}
this.pageNum = res.return_data.list.length == this.pageSize ? ++pagenum : pagenum;

223
pages/login/register.vue
View File

File diff suppressed because one or more lines are too long

46
pages/order/confirmation.vue
Unescape View File

@ -142,9 +142,16 @@
</image>{{paytheprice*100}}
</view>
</view>
<!-- #ifdef MP -->
<button class="btn" open-type="getPhoneNumber" v-if="user.phone == null"
@getphonenumber="getPhoneNumber">实际支付</button>
<button class="btn" v-else @tap="toPay">实际支付</button>
<!-- #endif -->
<!-- #ifdef H5 -->
<button class="btn" v-if="user.phone == null" @getphonenumber="bindUserPhone">实际支付</button>
<button class="btn" v-else @tap="toPay">实际支付</button>
<!-- #endif -->
</view>
</view>
</view>
@ -155,7 +162,8 @@
addOrder,
getCouponById,
GetPhoneNumber,
getUserNormalDiscountList
getUserNormalDiscountList,
bindUserPhone
} from '../../Utils/Api.js';
let app = getApp();
export default {
@ -202,30 +210,6 @@
this.getUserNormalDiscountList();
},
onShow() {
//页面显示时，加载订单信息
// uni.getStorage({
// key: 'buylist',
// success: (ret) => {
// this.buylist = ret.data;
// this.goodsPrice = 0;
// //合计
// let len = this.buylist.length;
// for (let i = 0; i < len; i++) {
// this.goodsPrice = this.goodsPrice + (this.buylist[i].number * this.buylist[i].price);
// }
// this.deduction = this.int / 100;
// this.sumPrice = this.goodsPrice - this.deduction + this.freight;
// }
// });
// uni.getStorage({
// key: 'selectAddress',
// success: (e) => {
// this.recinfo = e.data;
// uni.removeStorage({
// key: 'selectAddress'
// })
// }
// })
},
onHide() {
@ -303,7 +287,8 @@
if (this.couponList.salesPrice > this.UserNormalDiscountList[i].highDiscount.discountPrice) {
//满减价格
this.deductionPrice = this.UserNormalDiscountList[i].highDiscount.discountPrice;
this.paytheprice = (((this.couponList.salesPrice*100) - (this.deductionPrice*100))/100);
this.paytheprice = (((this.couponList.salesPrice * 100) - (this.deductionPrice * 100)) /
100);
} else {
uni.showToast({
title: '未满足满减条件',
@ -314,7 +299,7 @@
} else if (this.UserNormalDiscountList[i].highDiscount.discountType == 2) {
//抵扣价格
this.deductionPrice = this.UserNormalDiscountList[i].highDiscount.discountPrice;
this.paytheprice = (((this.couponList.salesPrice*100) - (this.deductionPrice*100))/100);
this.paytheprice = (((this.couponList.salesPrice * 100) - (this.deductionPrice * 100)) / 100);
} else if (this.UserNormalDiscountList[i].highDiscount.discountType == 3) {
// 打折
this.deductionPrice = this.couponList.salesPrice - this.couponList.salesPrice * (this
@ -325,6 +310,13 @@
}
}
},
// H5获取手机号
jumpH5Bding() {
uni.navigateTo({
url:'/pages/login/register?id=2'
})
},
// 微信获取手机号
getPhoneNumber(PhoneNumber) {
let params = {
openId: app.globalData.openId,

8
pages/tabBar/category/category.vue
Unescape View File

@ -56,9 +56,7 @@
<!-- <view class="loading-text" @click="getCouponList">{{ loadingText }}</view> -->
</scroll-view>
</view>
<!-- #ifdef H5 -->
<authorize></authorize>
<!-- #endif -->
</view>
</template>
<script>
@ -67,12 +65,8 @@
getStoreListByMerchant,
getMerchantList
} from "../../../Utils/Api.js";
import authorize from '../../../components/Authorize';
let app = getApp();
export default {
components: {
authorize
},
data() {
return {
showCategoryIndex: 0,

10
pages/tabBar/home/home.vue
Unescape View File

@ -105,9 +105,7 @@
</view>
<!-- <view class="loading-text">{{ loadingText }}</view> -->
</view>
<!-- #ifdef H5 -->
<authorize></authorize>
<!-- #endif -->
</view>
</template>
@ -118,12 +116,8 @@
getCouponList,
getH5UserInfo
} from "../../../Utils/Api.js"; //您的api路径
import authorize from '../../../components/Authorize';
let app = getApp();
export default {
components: {
authorize
},
export default {
data() {
return {
showHeader: true,

2
pages/tabBar/user/user.vue
Unescape View File

@ -95,7 +95,7 @@
</view>
<!-- 占位 -->
<view class="place-bottom"></view>
<!-- <authorize></authorize> -->
<authorize></authorize>
</view>
</template>
<script>

3
pages/user/order_list/order_list.vue
Unescape View File

@ -115,6 +115,9 @@
},
onLoad(option) {
// #ifdef H5
this.headerTop = '44px';
// #endif
let tbIndex = parseInt(option.tbIndex) + 1;
this.list = this.orderList[tbIndex];
this.tabbarIndex = tbIndex;

BIN
static/img/share/wxd.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

Write Preview
Loading…
Cancel
Save