liuyao 1 anno fa
parent
commit
b2f1211d31

+ 1 - 0
api/pages/sharesign/integralShare.js

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

+ 1 - 1
i18n/zh-CN.js

@@ -350,7 +350,7 @@ const basicData = {
   supervisor: '仓库主管',
   supervisor: '仓库主管',
   channelCode: '渠道编码',
   channelCode: '渠道编码',
   channelName: '渠道名称',
   channelName: '渠道名称',
-  dataName: '资名称',
+  dataName: '资名称',
   dataCode: '资源编码',
   dataCode: '资源编码',
 
 
   incomeCode: '收入编码',
   incomeCode: '收入编码',

+ 9 - 0
package-basic-data/pages/beginner-guide/beginner-guide.js

@@ -171,6 +171,15 @@ Page({
     if (item.title == '库存统计') {
     if (item.title == '库存统计') {
       url = '/package-inventory/pages/ivt-detail-report/ivt-detail-report'
       url = '/package-inventory/pages/ivt-detail-report/ivt-detail-report'
     }
     }
+    if (item.title == '经营概况') {
+      url = '/package-business-analysis/pages/business-overview/business-overview'
+    }
+    if (item.title == '销售汇总表') {
+      url = '/package-sales/pages/order-sum-report/order-sum-report'
+    }
+    if (item.title == '库存查询') {
+      url = '/package-inventory/pages/ivt-detail-report/ivt-detail-report'
+    }
     this.setData({
     this.setData({
       loading: true
       loading: true
     })
     })