xing.li 3 years ago
parent
commit
21a96c1b61

+ 2 - 2
api/welfareMall.js

@@ -151,8 +151,8 @@ class WelfareMall extends request {
     let params = {
       orderSn:orderSn,
       source: "FREE_MINI_APP",
-      thirdPartyName: 'coupon-activity',
-      payCode: "HSAY-SHARE",
+      thirdPartyName: 'welfare-go',
+      payCode: "LongMaoWelfare",
       openId: openId
     };
     if(isOrderPayment){

+ 1 - 1
app.js

@@ -135,7 +135,7 @@ App({
   },
   globalData: {
     userInfo: null,
-    appCode:'HSAY_SHARE_COUPON',
+    appCode:'WELFARE_GO',
     typeSwitchObj : {"C":'现金券',"D":"折扣券"}
   },
   showLoading() {

+ 1 - 1
components/jumpmallapp.wxml

@@ -1,7 +1,7 @@
 <!--components/jumpmallapp.wxml-->
 <navigator class="_btn _exchange" 
                 target = "miniProgram" 
-                app-id="wxd92a2d29f8022f40"
+                app-id="wx421f7e2128950059"
                 path="pages/index/index"
                 extra-data="{foo: 'bar'}"
                 open-type='navigate'>

BIN
images/loading.gif


BIN
images/welfareMall/bag_content.png


BIN
images/welfareMall/buy_info.png


BIN
images/welfareMall/home-active.png


BIN
images/welfareMall/home.png


BIN
images/welfareMall/service-img.png


BIN
images/welfareMall/use_info.png


BIN
images/welfareMall/user-active.png


BIN
images/welfareMall/user.png


+ 5 - 5
pages/welfareMall/feedback/feedback.wxml

@@ -39,7 +39,7 @@
 
     <view>
 
-    <view class="info-title">温馨提示</view>
+    <!-- <view class="info-title">温馨提示</view>
       <view class="info-view flex-row" bindtap="goToRefund">
         <image src="/images/zytx.png" class="zytx"></image>
         <view class="refund-info">关于如何去退款>></view>
@@ -47,7 +47,7 @@
       <view class="info-view flex-row" bindtap="goToBuy">
         <image src="/images/zytx.png" class="zytx"></image>
         <view class="refund-info">关于如何使用券>></view>
-      </view>
+      </view> -->
     </view>
 
     <view>
@@ -59,9 +59,9 @@
     <!-- 弹框 -->
     <view class="bg-zindex" wx:if="{{hideWindowValue}}">
       <view class="success_window flex-column">
-        <view class="w_title">非常感谢您的反馈</view>
-        <view class="w_text"><text class="hsay_text">沪上阿姨有您更优秀<br />
-            研发团队正在拼命优化中</text></view>
+        <view class="w_title">感谢您的反馈</view>
+        <view class="w_text"><text class="hsay_text"><br />
+            研发团队正在优化中</text></view>
         <view class="w_border"></view>
         <view class="w_go_order" bindtap="goPerson">我知道了</view>
       </view>

+ 1 - 0
pages/welfareMall/order/orderCompletion.js

@@ -251,6 +251,7 @@ Page({
       mobile: getMobileCache(),
       orderSn: that.data.orderSn,
       reason: reason,
+      thirdPartyName:"welfare-go"
     });
      that.cancel();
 

+ 1 - 1
pages/welfareMall/personal/personal.wxml

@@ -56,7 +56,7 @@
       </view>
       <!-- 员工通道 -->
       <view><button class="wx-isLogin-broadcast" wx:if="{{!isLogin}}" open-type="getPhoneNumber" bindgetphonenumber="getStaff"></button>
-        <image class="broadcast" catchtap="toStaff" src="{{staffImgList.length > 0 && staffImgList[0].figure?staffImgList[0].figure:'https://dy.shpr.top/welfareGo/broadcast1.png'}}"></image>
+        <!-- <image class="broadcast" catchtap="toStaff" src="{{staffImgList.length > 0 && staffImgList[0].figure?staffImgList[0].figure:'https://dy.shpr.top/welfareGo/broadcast1.png'}}"></image> -->
       </view>
       <!-- 内容 -->
       <view class="content flex-column">

+ 2 - 2
pages/welfareMall/personal/personal.wxss

@@ -280,8 +280,8 @@ page{
   margin-left: 12rpx;
   font-size: 22rpx;
   text-align: center;
-  color: #B0D342;
-  border: #B0D342 2rpx solid;
+  color: #303030;
+  border: #303030 2rpx solid;
   border-radius: 4rpx;
 }
 

+ 3 - 3
project.config.json

@@ -36,7 +36,7 @@
       "disablePlugins": [],
       "outputPath": ""
     },
-    "useIsolateContext": false,
+    "useIsolateContext": true,
     "userConfirmedBundleSwitch": false,
     "packNpmManually": false,
     "packNpmRelationList": [],
@@ -49,8 +49,8 @@
   },
   "compileType": "miniprogram",
   "libVersion": "2.23.4",
-  "appid": "wxcc1cdb8babd3f62c",
-  "projectname": "%E9%A3%9E%E7%A0%81",
+  "appid": "wx4b18f42fd98d6bcd",
+  "projectname": "saas%E7%A6%8F%E5%88%A9go",
   "debugOptions": {
     "hidedInDevtools": []
   },

+ 2 - 2
utils/request.js

@@ -4,9 +4,9 @@ class request {
     //本地的
   //  static BASE_URL = 'http://localhost:8014/'
 //   pre环境的
-//   static BASE_URL = 'https://oapi.shpr.top/'
+
 //   正式的
-   static BASE_URL = 'https://vapi.hsayi.com/'
+   static BASE_URL = 'https://menu-coupon-api.overseasdragon.com.cn/'
 //   @todo需要修改正式的域名
 
   static HEAD = {