fe / weixinapp-qq · Commits

Go to a project

Authored by 陈峰
Commit f43922aa7012b8b30b8b17ed1f73609b8ae1ff1b 2 parents 8b2b82bc ee99ce2e

Merge branch 'release/1.0.0' into 'master' 

Release/1.0.0



See merge request !3
Inline Side-by-side
Showing 11 changed files with 52 additions and 38 deletions
... ... @@ -96,9 +96,9 @@ App({
}
setTimeout(function () {
wechatLoginAction(function (response) {
that.getShareInfo();
});
wechatLoginAction(function (response) {
that.getShareInfo();
});
}, 1000);
this.mtainit(options);
this.addListener();
... ...
{
"compilerOptions": {
"target": "es2015",
"module": "commonjs"
}
{
"compilerOptions": {
"target": "es2015",
"module": "commonjs"
}
}
\ No newline at end of file
... ...
... ... @@ -80,7 +80,7 @@ function request(method = 'GET') {
}
params.source_type = "wechat";
params.client_type = "miniapp";
params.business_line = "miniapp";
params.business_line = "qqliteYoho";
params.user_source = "wechat"
if (params && !params.hasOwnProperty('udid')) {
... ... @@ -117,6 +117,7 @@ function request(method = 'GET') {
'Content-Type': 'application/x-www-form-urlencoded',
'x-yoho-verify': resultString,
'Cookies': 'JSESSIONID=' + sessionkey,
'Cookie': 'JSESSIONID=' + sessionkey,
}
wx.request({
... ... @@ -161,7 +162,7 @@ function request(method = 'GET') {
}
params.source_type = "wechat";
params.client_type = "miniapp";
params.business_line = "miniapp";
params.business_line = "qqliteYoho";
params.user_source = "wechat"
if (params && !params.hasOwnProperty('udid')) {
... ... @@ -198,6 +199,7 @@ function request(method = 'GET') {
'Content-Type': 'application/x-www-form-urlencoded',
'x-yoho-verify': resultString,
'Cookies': 'JSESSIONID=' + sessionkey,
'Cookie': 'JSESSIONID=' + sessionkey,
}
wx.request({
... ... @@ -295,7 +297,7 @@ function _publicParams() {
return {
app_version,
os_version,
os_version: '8.0.0',
client_type,
screen_size,
// physical_channel,
... ... @@ -323,11 +325,7 @@ function _signParam(params,opt) {
let resultParams = objectAssign(allParams, {client_secret});
let resultString;
if (opt === true){
resultString = queryString.stringify(resultParams,{encode: true});
}else{
resultString = queryString.stringify(resultParams,{encode: false});
}
resultString = queryString.stringify(resultParams,{encode: false});
return resultString;
}
... ... @@ -343,11 +341,7 @@ function _signParam(params,opt) {
let resultParams = objectAssign(allParams, {client_secret});
let resultString;
if (opt === true){
resultString = queryString.stringify(resultParams,{encode: true});
}else{
resultString = queryString.stringify(resultParams,{encode: false});
}
resultString = queryString.stringify(resultParams,{encode: false});
return resultString;
}
... ... @@ -389,7 +383,7 @@ export function uploadFile(filePath, index) {
}
params.source_type = "wechat";
params.client_type = "miniapp";
params.business_line = "miniapp";
params.business_line = "qqliteYoho";
params.user_source = "wechat"
params.project = "evidenceImages"
... ...
... ... @@ -579,8 +579,9 @@ Page(extend({}, Actionsheet, Toast, {
},
share: function (event) {
this.setData({
'actionsheet.show': true
'actionsheet.show': false
})
},
shareHide: function (event) {
... ...
... ... @@ -62,7 +62,7 @@
</view>
<view class="goodShare">
<image class="shareIcon" src="./images/share-ic@2x.png" bindtap="share"></image>
<button bindtap="share" formType="submit" class="shareButton"></button>
<button bindtap="share" open-type="share" formType="submit" class="shareButton"></button>
</view>
</view>
... ...
... ... @@ -149,7 +149,7 @@ Component({
})
return;
}else { //多选
if(index === 0){//展开默认的下拉菜单
if (index === 0) {//展开默认的下拉菜单
var isShowDefaultSheet = this.properties.isShowDefaultSheet;
if (!isShowDefaultSheet) {
this.triggerEvent('defaultTabTap', { isShowDefaultSheet});
... ... @@ -157,7 +157,7 @@ Component({
this.setData({
isShowDefaultSheet: !isShowDefaultSheet
})
}else {
} else {
currentItem.isAsc = !currentItem.isAsc;
tabs.splice(index,1,currentItem);
this.setData({
... ... @@ -184,7 +184,7 @@ Component({
isShowDefaultSheet: false,
tabs,
selectIndex: index,
order
order: order || ''
});
this.updateProductList();
}
... ... @@ -234,6 +234,7 @@ Component({
updateProductList() {
var order = this.data.order;
console.log('order: ', order);
var event = {
order
}
... ...
import { API_HOST, SERVICE_HOST } from '../../libs/config';
import { API_HOST, SERVICE_HOST, PAYMENT_CODE } from '../../libs/config';
import { GET, POST } from '../../libs/request';
import { wexinPay } from '../../utils/wxpay';
import { getYHStorageSync } from '../../utils/util';
... ... @@ -1078,7 +1078,7 @@ Page({
receiverMobile: delivery_address ? delivery_address.mobile : "",
use_yoho_coin: this.data.needYohoCode ? this.data.use_yoho_coin : 0,//double 否 1.00 使用的yoho币金额，单位元
use_red_envelopes: 0,//使用的红包，单位元
payment_id: 15,//int 否 15 支付id
payment_id: PAYMENT_CODE,//int 否 15 支付id
payment_type: 1,//支付方式，1 在线支付 2 货到付款
coupon_code: this.data.hasSelectYohoCouponCode ? this.data.hasSelectYohoCouponCode : "",//优惠券code,多个用","分割
client_type: 'miniapp',//string 否 web iphone 终端
... ... @@ -1229,7 +1229,7 @@ Page({
delivery_time: delivery_time ? delivery_time.delivery_time_id : 0,//int 否 2 寄送时间类型
use_yoho_coin: this.data.needYohoCode ? this.data.use_yoho_coin : 0,//double 否 1.00 使用的yoho币金额，单位元
use_red_envelopes: 0,//使用的红包，单位元
payment_id: 15,//int 否 15 支付id
payment_id: PAYMENT_CODE,//int 否 15 支付id
payment_type: 1,//支付方式，1 在线支付 2 货到付款
coupon_code: this.data.hasSelectYohoCouponCode ? this.data.hasSelectYohoCouponCode : "",//优惠券code,多个用","分割
client_type: 'miniapp',//string 否 web iphone 终端
... ... @@ -1249,7 +1249,7 @@ Page({
delivery_time: delivery_time ? delivery_time.delivery_time_id : 0,
delivery_way: delivery_way ? delivery_way.delivery_way_id : 1,
payment_type: 1,
payment_id: 15,
payment_id: PAYMENT_CODE,
use_yoho_coin: this.data.needYohoCode ? this.data.use_yoho_coin : 0,
use_red_envelopes: 0,
product_sku_list: this._getLimitProductData(goods)
... ... @@ -1260,7 +1260,7 @@ Page({
param = {
method: 'app.Shopping.deposit.submit',
payment_type: 1,
payment_id: 15,
payment_id: PAYMENT_CODE,
delivery_time: delivery_time ? delivery_time.delivery_time_id : 0,
delivery_way: delivery_way ? delivery_way.delivery_way_id : 1,
cart_type: 'advance',
... ... @@ -1389,7 +1389,7 @@ Page({
delivery_time: delivery_time ? delivery_time.delivery_time_id : 0,//int 否 2 寄送时间类型
use_yoho_coin: this.data.needYohoCode ? this.data.use_yoho_coin : 0,//double 否 1.00 使用的yoho币金额，单位元
use_red_envelopes: 0,//使用的红包，单位元
payment_id: 15,//int 否 15 支付id
payment_id: PAYMENT_CODE,//int 否 15 支付id
payment_type: 1,//支付方式，1 在线支付 2 货到付款
coupon_code: this.data.hasSelectYohoCouponCode ? this.data.hasSelectYohoCouponCode : "",//优惠券code,多个用","分割
client_type: 'miniapp',//string 否 web iphone 终端
... ...
... ... @@ -50,6 +50,24 @@ Page(extend({},Toast,{
// console.log('avatar tapped!!')
},
contact() {
wx.showModal({
title: '',
content: '请拨打有货电话客服4008899646',
confirmText: "拨打",
confirmColor: "#000000",
success: function (res) {
if (res.confirm) {
qq.makePhoneCall({
phoneNumber: '4008899646' // 仅为示例，并非真实的电话号码
})
} else {
}
}
})
},
onLoad: function (options) {
this.setData({
hasUnionID: app.globalData.WXUnion_ID !== null && app.globalData.WXUnion_ID !== '' && app.globalData.WXUnion_ID !== undefined ? true:false,
... ...
... ... @@ -183,7 +183,8 @@
<view class="view-splite clearfix"/>
<button class='im-button' open-type="contact" bindcontact="handleContact">
<!-- <button class='im-button' open-type="contact" bindcontact="handleContact"> -->
<button class='im-button' bindtap="contact">
<view class='im-left-view'>
<image src="images/kd_ic_2x.png" class="icon-image"></image>
<view class="im-button-title">在线客服</view>
... ...
... ... @@ -26,11 +26,10 @@
"list": []
},
"game": {
"current": -1,
"list": []
},
"miniprogram": {
"current": 8,
"current": 24,
"list": [
{
"id": -1,
... ...
... ... @@ -161,7 +161,7 @@ function wexinPay(data,payParam){
logEvent(YB_SC_PAY_RES, params);
if(res.errMsg=='requestPayment:fail cancel'){
if(res.errMsg.indexOf('requestPayment:fail') != -1){
wx.redirectTo({
url: '/pages/orders/orders'
})
... ... @@ -210,7 +210,7 @@ function wexinPay(data,payParam){
let param = {
method:'app.SpaceOrders.payConfirm',
order_code:orderCode,
payment_id:45,
payment_id: PAYMENT_CODE,
uid:app.globalData.userInfo.uid,
}
... ...