,coupon,integral,integralShare,integralItem,integralTactic,sign

api/pages/sharesign/integralShare.js

@@ -10,7 +10,7 @@
 module.exports = {
 	integralShareService: { 
 		// 前缀
-		prefix: 'oauth-server/integralShare/',
+		prefix: 'oauth-server/oauth/integralShare/',
 	},
 	routeUrl: {
 		integralShare: {

api/pages/sharesign/integralTactic.js

@@ -10,7 +10,7 @@
 module.exports = {
 	integralTacticService: { 
 		// 前缀
-		prefix: 'oauth-server/integralTactic/',
+		prefix: 'oauth-server/oauth/integralTactic/',
 	},
 	routeUrl: {
 		integralTactic: {

app.js

@@ -76,19 +76,14 @@ const exportPage = require('./api/pages/common/export.js');
 const inboundItem = require('./api/pages/ivt/inboundItem.js');
 const accReceiptPayment = require('./api/pages/mac/accReceiptPayment.js');
 const supReceiptPayment = require('./api/pages/mac/supReceiptPayment.js');
-const followPlan = require('./api/pages/mst/followPlan.js');
-<<<<<<< HEAD
-const share = require('./api/pages/sharesign/share.js');
-=======
-const share = require('./api/pages/mst/share.js');
+const followPlan = require('./api/pages/mst/followPlan.js'); 
+const share = require('./api/pages/sharesign/share.js'); 
 const coupon = require('./api/pages/sharesign/coupon.js');
 const integral = require('./api/pages/sharesign/integral.js');
 const integralShare = require('./api/pages/sharesign/integralShare.js');
 const integralItem = require('./api/pages/sharesign/integralItem.js');
 const integralTactic = require('./api/pages/sharesign/integralTactic.js');
-const sign = require('./api/pages/sharesign/sign.js');
-
->>>>>>> b4d6ea8c8e148502fda85e5eb1621327ad3fdb41
+const sign = require('./api/pages/sharesign/sign.js'); 
 
 // api服务路由文件
 var apiList = [common, oauth,setting, company, wechatPay,user, staff, staffRight, staffPurview, settingValue, customer, role, roleFun, org, roleSensitive, goodsBrand, goodsCategory, goodsSeries, unit, supplier, warehouse, saleChannel, goodsSku, basicData,customerMst,purchase,account,payment,

package-basic-data/pages/sign/sign.js

@@ -12,14 +12,16 @@ Page({
         staffPhone: app.globalData.user.staffPhone,
         companyName: app.globalData.company.cpName,
         versionName: '',
+        // 路由
+        routeObjName: 'sign',
+        integralTacticService: app.globalData['integralTacticService'],
     },
 
     /**
      * 生命周期函数--监听页面加载
      */
     onLoad(options) {
-        console.log(app.globalData, this.data.freeVersionFlag);
-
+        this.getIntegralTactic()
     },
 
     loadInit() {
@@ -28,4 +30,24 @@ Page({
         })
     },
 
+
+    /**
+    * @desc : 策略
+    * @author : 姜永辉
+    * @date : 2024/4/1
+    */
+    getIntegralTactic() {
+        let params = {}
+        let service = app.globalData['integralTacticService']
+        this.excute(service, service.selectByCond, params).then(res => {
+            if (res.data.code == Constants.SUCESS_CODE) {
+                console.log(res.data, "getIntegralTactic");
+                if (res.data && res.data.data) {
+                    let activityTable = res.data.data;
+
+                }
+            }
+        });
+    },
+
 })