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,7 +530,7 @@ Page({
530 } 530 }
531 531
532 if(gg.prom_type==4){ 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 data:{store_id:os.stoid,goods_id:gg.goods_id} 534 data:{store_id:os.stoid,goods_id:gg.goods_id}
535 }).then(res=>{ 535 }).then(res=>{
536 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ 536 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
@@ -654,7 +654,7 @@ Page({ @@ -654,7 +654,7 @@ Page({
654 } 654 }
655 655
656 if(goodsinfo.prom_type==4 && !good.is_integral_normal){ 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 data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} 658 data:{store_id:os.stoid,goods_id:goodsinfo.goods_id}
659 }).then(res=>{ 659 }).then(res=>{
660 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ 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,7 +82,7 @@ Page({
82 wx.showLoading(); 82 wx.showLoading();
83 getApp().request.put("/api/weshop/users/update", { 83 getApp().request.put("/api/weshop/users/update", {
84 data: { 84 data: {
85 - storeId: os.stoid, 85 + store_id: os.stoid,
86 user_id: getApp().globalData.user_id, 86 user_id: getApp().globalData.user_id,
87 nickname: this.data.ob.nickname, 87 nickname: this.data.ob.nickname,
88 head_pic: this.data.ob.head_pic 88 head_pic: this.data.ob.head_pic
pages/cart/cart2_inte/cart2_inte.js
  View file @83ba8ef
@@ -524,7 +524,7 @@ Page({ @@ -524,7 +524,7 @@ Page({
524 wx.navigateBack(); 524 wx.navigateBack();
525 break; 525 break;
526 case 4: //-- 积分购 -- 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 data: { store_id: os.stoid, goods_id: gg.goods_id }, 528 data: { store_id: os.stoid, goods_id: gg.goods_id },
529 success: async function (tt) { 529 success: async function (tt) {
530 if (tt.data.code == 0 && tt.data.data && tt.data.data.pageData) { 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,7 +580,7 @@ Page({
580 } 580 }
581 581
582 if(gg.prom_type==4){ 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 data:{store_id:os.stoid,goods_id:gg.goods_id} 584 data:{store_id:os.stoid,goods_id:gg.goods_id}
585 }).then(res=>{ 585 }).then(res=>{
586 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ 586 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
@@ -704,7 +704,7 @@ Page({ @@ -704,7 +704,7 @@ Page({
704 } 704 }
705 705
706 if(goodsinfo.prom_type==4 && !good.is_integral_normal){ 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 data:{store_id:os.stoid,goods_id:goodsinfo.goods_id} 708 data:{store_id:os.stoid,goods_id:goodsinfo.goods_id}
709 }).then(res=>{ 709 }).then(res=>{
710 if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ 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,7 +962,7 @@ Page({
962 } 962 }
963 963
964 if (gg.prom_type == 4) { 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 data: { store_id: os.stoid, goods_id: gg.goods_id } 966 data: { store_id: os.stoid, goods_id: gg.goods_id }
967 }).then(res => { 967 }).then(res => {
968 if (res.data.code == 0 && res.data.data && res.data.data.pageData) { 968 if (res.data.code == 0 && res.data.data && res.data.data.pageData) {
@@ -1083,7 +1083,7 @@ Page({ @@ -1083,7 +1083,7 @@ Page({
1083 } 1083 }
1084 1084
1085 if (goodsinfo.prom_type == 4 && !good.is_integral_normal) { 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 data: { store_id: os.stoid, goods_id: goodsinfo.goods_id } 1087 data: { store_id: os.stoid, goods_id: goodsinfo.goods_id }
1088 }).then(res => { 1088 }).then(res => {
1089 if (res.data.code == 0 && res.data.data && res.data.data.pageData) { 1089 if (res.data.code == 0 && res.data.data && res.data.data.pageData) {