wxd / MShopWeApp

Commit 83ba8ef6c5e5baf7f51b19c417b95b9e115fcc18

Authored by WXD-SEASON\season
2 parents 672b7e6e f9d64e06

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

Inline Side-by-side
Showing 5 changed files with 8 additions and 8 deletions
packageD/pages/shop/order_detail/order_detail.js
  View file @83ba8ef
... ... @@ -530,7 +530,7 @@ Page({
530 530 }
531 531  
532 532 if(gg.prom_type==4){
533   - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
  533 + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{
534 534 data:{store_id:os.stoid,goods_id:gg.goods_id}
535 535 }).then(res=>{
536 536 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
... ... @@ -654,7 +654,7 @@ Page({
654 654 }
655 655  
656 656 if(goodsinfo.prom_type==4 && !good.is_integral_normal){
657   - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
  657 + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{
658 658 data:{store_id:os.stoid,goods_id:goodsinfo.goods_id}
659 659 }).then(res=>{
660 660 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
... ...
packageE/pages/user/nick_avatar/nick_avatar.js
  View file @83ba8ef
... ... @@ -82,7 +82,7 @@ Page({
82 82 wx.showLoading();
83 83 getApp().request.put("/api/weshop/users/update", {
84 84 data: {
85   - storeId: os.stoid,
  85 + store_id: os.stoid,
86 86 user_id: getApp().globalData.user_id,
87 87 nickname: this.data.ob.nickname,
88 88 head_pic: this.data.ob.head_pic
... ...
pages/cart/cart2_inte/cart2_inte.js
  View file @83ba8ef
... ... @@ -524,7 +524,7 @@ Page({
524 524 wx.navigateBack();
525 525 break;
526 526 case 4: //-- 积分购 --
527   - getApp().request.get("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", {
  527 + getApp().request.get("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
528 528 data: { store_id: os.stoid, goods_id: gg.goods_id },
529 529 success: async function (tt) {
530 530 if (tt.data.code == 0 && tt.data.data && tt.data.data.pageData) {
... ...
pages/user/order_detail/order_detail.js
  View file @83ba8ef
... ... @@ -580,7 +580,7 @@ Page({
580 580 }
581 581  
582 582 if(gg.prom_type==4){
583   - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
  583 + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{
584 584 data:{store_id:os.stoid,goods_id:gg.goods_id}
585 585 }).then(res=>{
586 586 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
... ... @@ -704,7 +704,7 @@ Page({
704 704 }
705 705  
706 706 if(goodsinfo.prom_type==4 && !good.is_integral_normal){
707   - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1",{
  707 + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2",{
708 708 data:{store_id:os.stoid,goods_id:goodsinfo.goods_id}
709 709 }).then(res=>{
710 710 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
... ...
pages/user/order_list/order_list.js
  View file @83ba8ef
... ... @@ -962,7 +962,7 @@ Page({
962 962 }
963 963  
964 964 if (gg.prom_type == 4) {
965   - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", {
  965 + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
966 966 data: { store_id: os.stoid, goods_id: gg.goods_id }
967 967 }).then(res => {
968 968 if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
... ... @@ -1083,7 +1083,7 @@ Page({
1083 1083 }
1084 1084  
1085 1085 if (goodsinfo.prom_type == 4 && !good.is_integral_normal) {
1086   - await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1", {
  1086 + await getApp().request.promiseGet("/api/weshop/integralbuy/pageIntegralBuyGoodsList?stype=1&stypeup=1&timetype=2", {
1087 1087 data: { store_id: os.stoid, goods_id: goodsinfo.goods_id }
1088 1088 }).then(res => {
1089 1089 if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
... ...