去掉分包

src/api/config.js

@@ -1,7 +1,7 @@
 // 配置请求对象
 // 本地调试 dev 开发阶段
-// export const baseUrl = "https://test-openai.fyshark.com";//测试
-export const baseUrl = "https://openai.fyshark.com";//正式
+export const baseUrl = "https://test-openai.fyshark.com";//测试
+// export const baseUrl = "https://openai.fyshark.com";//正式
 // product 阶段
 // https://www.fastmock.site/mock/3f112f6cb2f621fc9c2dd6a14be19f38/beers/
 // 设计模式

src/api/request.js

@@ -1,6 +1,7 @@
 import Taro from '@tarojs/taro';
 import ttappid from '../../project.tt.json'
 import wxappid from '../../project.config.json'
+import kwaiappid from '../../project.kwai.json'
 import {
   baseUrl
 } from './config';
@@ -19,6 +20,8 @@ export default (options = {
     request_data['appid'] = wxappid.appid
   } else if (process.env.TARO_ENV === 'tt') {
     request_data['appid'] = ttappid.appid
+  }else if (process.env.TARO_ENV === 'kwai') {
+    request_data['appid'] = kwaiappid.appid
   }
   return Taro.request({
     url: baseUrl + options.url,

src/app.config.js

@@ -5,38 +5,23 @@ export default defineAppConfig({
     'pages/index/index',
     "pages/mine/index",
     'pages/collection/index',
-    "pages/activity/index"
-  ],
-  subpackages: [
-    {
-      root: "moduleA",
-      name: "分包A",
-      pages: [
-        "pages/invite/index",
-        "pages/wallet/index",
-        "pages/shareCnt/index",
-        "pages/upload/index",//图片裁剪页面
-        "pages/darwDetailIndex/index",//图片作品页面
-        "pages/communityDetail/index",
-        "pages/earnPoints/index",
-      ]
-    },
-    {
-      root: "moduleB",
-      name: "分包B",
-      pages: [
-        "pages/imageWorks/index",//图画作品
-        "pages/like/index",//我的喜欢
-        "pages/comic/index",//人物动漫画
-        "pages/comicDetail/index",//人物动漫画详情页
-        "pages/poetry/index",//诗词绘画
-        "pages/faceChanging/index",//AI换脸
-        "pages/point/index",//新手指引
-        "pages/real/index",//资讯
-        "pages/realDetail/index",//资讯
-      ]
-    },
-    
+    "pages/activity/index",
+    "pages/invite/index",
+    "pages/wallet/index",
+    "pages/shareCnt/index",
+    "pages/upload/index",//图片裁剪页面
+    "pages/darwDetailIndex/index",//图片作品页面
+    "pages/communityDetail/index",
+    "pages/earnPoints/index",
+    "pages/imageWorks/index",//图画作品
+    "pages/like/index",//我的喜欢
+    "pages/comic/index",//人物动漫画
+    "pages/comicDetail/index",//人物动漫画详情页
+    "pages/poetry/index",//诗词绘画
+    "pages/faceChanging/index",//AI换脸
+    "pages/point/index",//新手指引
+    "pages/real/index",//资讯
+    "pages/realDetail/index",//资讯
   ],
   window: {
     backgroundTextStyle: 'light',

src/pages/collection/index.jsx

@@ -90,7 +90,7 @@ export default class collection extends Component {
   detail (item, index) {
     console.log(item, 'item');
     Taro.navigateTo({
-      url: `/moduleA/pages/communityDetail/index?task_id=${item.id}`
+      url: `/pages/communityDetail/index?task_id=${item.id}`
     })
   }
 

src/moduleB/pages/comic/index.jsx

@@ -1,7 +1,7 @@
 import { Component } from 'react'
 import { View, Text, Button, Image, scrollView, Input } from '@tarojs/components'
-import * as api from '../../../service/index'
-import tool from '../../../common/tool'
+import * as api from '../../service/index'
+import tool from '../../common/tool'
 import Taro, { } from '@tarojs/taro'
 import './index.less'
 
@@ -103,7 +103,7 @@ export default class collection extends Component {
         })
         Taro.hideLoading()
         Taro.navigateTo({
-          url: `/moduleA/pages/upload/index?image=${file}`
+          url: `/pages/upload/index?image=${file}`
         })
       }
     })
@@ -117,7 +117,7 @@ export default class collection extends Component {
     api.drawGcImg({ img_url: this.state.consultImg, style_id: this.state.creatInfo.models[this.state.modelIndex].id }).then(res => {
       if (res.code == 200) {
         Taro.navigateTo({
-          url: `/moduleB/pages/comicDetail/index?task_id=${res.data.task_id}`
+          url: `/pages/comicDetail/index?task_id=${res.data.task_id}`
         })
       } else {
         Taro.hideLoading()
@@ -186,7 +186,7 @@ export default class collection extends Component {
       Taro.hideLoading()
       if (data.isEnded) {
         Taro.navigateTo({
-          url: `/moduleB/pages/comicDetail/index?task_id=${that.state.drawTaskId}`
+          url: `/pages/comicDetail/index?task_id=${that.state.drawTaskId}`
         })
       } else {
        
@@ -224,7 +224,7 @@ export default class collection extends Component {
         if (res && res.isEnded || res === undefined) {
           // 正常播放结束，可以下发游戏奖励
           Taro.navigateTo({
-            url: `/moduleB/pages/comicDetail/index?task_id=${that.state.drawTaskId}`
+            url: `/pages/comicDetail/index?task_id=${that.state.drawTaskId}`
           })
         } else {
           //提前关闭小程序

src/moduleB/pages/comicDetail/index.jsx

@@ -1,7 +1,7 @@
 import { Component } from 'react'
 import { View, Text, Button, Image, ScrollView, Input } from '@tarojs/components'
-import * as api from '../../../service/index'
-import tool from '../../../common/tool'
+import * as api from '../../service/index'
+import tool from '../../common/tool'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
 import './index.less'
 

src/moduleA/pages/communityDetail/index.jsx

@@ -1,9 +1,9 @@
 import { Component } from 'react'
 import { View, Swiper, SwiperItem, Image, Textarea } from '@tarojs/components'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import TaroCanvasDrawer from '../../../component/taro-plugin-canvas';
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import TaroCanvasDrawer from '../../component/taro-plugin-canvas';
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Task extends Component {
@@ -356,7 +356,7 @@ export default class Task extends Component {
   }
   copyPromptAI () {
     Taro.navigateTo({
-      url: `/moduleB/pages/faceChanging/index?img=${this.state.img_info.img}`
+      url: `/pages/faceChanging/index?img=${this.state.img_info.img}`
     })
   }
 

src/moduleA/pages/darwDetailIndex/index.jsx

@@ -1,9 +1,9 @@
 import { Component } from 'react'
 import { View, Swiper, SwiperItem, Image, Textarea, Canvas, Button } from '@tarojs/components'
 import Taro, { getCurrentInstance, CanvasContext } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import TaroCanvasDrawer from '../../../component/taro-plugin-canvas';
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import TaroCanvasDrawer from '../../component/taro-plugin-canvas';
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Task extends Component {
@@ -225,7 +225,7 @@ export default class Task extends Component {
   }
   copyPromptAI () {
     Taro.navigateTo({
-      url: `/moduleB/pages/faceChanging/index?img=${this.state.draw_infos[this.state.current].img}`
+      url: `/pages/faceChanging/index?img=${this.state.draw_infos[this.state.current].img}`
     })
   }
 

src/moduleA/pages/earnPoints/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from 'react'
 import { View, Swiper, SwiperItem, Image, Textarea, Text, ScrollView, RichText } from '@tarojs/components'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Task extends Component {
@@ -95,7 +95,7 @@ export default class Task extends Component {
     }
     if (item.btn_title == '邀请') {
       Taro.navigateTo({
-        url: '/moduleA/pages/invite/index'
+        url: '/pages/invite/index'
       })
       return
     }
@@ -225,7 +225,7 @@ export default class Task extends Component {
   }
   toShareCnt () {
     Taro.navigateTo({
-      url: '/moduleA/pages/shareCnt/index'
+      url: '/pages/shareCnt/index'
     })
   }
   //充值

src/moduleB/pages/faceChanging/index.jsx

@@ -1,7 +1,7 @@
 import { Component } from 'react'
 import { View, Text, Button, Image, scrollView, Input } from '@tarojs/components'
-import * as api from '../../../service/index'
-import tool from '../../../common/tool'
+import * as api from '../../service/index'
+import tool from '../../common/tool'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
 import './index.less'
 
@@ -117,7 +117,7 @@ export default class collection extends Component {
         })
         Taro.hideLoading()
         Taro.navigateTo({
-          url: `/moduleA/pages/upload/index?image=${file}`
+          url: `/pages/upload/index?image=${file}`
         })
       }
     })
@@ -160,7 +160,7 @@ export default class collection extends Component {
             success: function (res) {
               if (res.confirm) {
                 Taro.navigateTo({
-                  url: `/moduleA/pages/earnPoints/index`
+                  url: `/pages/earnPoints/index`
                 })
               } else if (res.cancel) {
                 console.log('用户点击取消')

src/moduleB/pages/imageWorks/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from 'react'
 import { View, Swiper, SwiperItem, Image, Textarea, Canvas, Button } from '@tarojs/components'
 import Taro, { getCurrentInstance, CanvasContext } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Task extends Component {
@@ -116,7 +116,7 @@ export default class Task extends Component {
 
     } else {
         Taro.navigateTo({
-          url: `/moduleA/pages/darwDetailIndex/index?task_id=${item.task_id}&img_id=${item.id}`
+          url: `/pages/darwDetailIndex/index?task_id=${item.task_id}&img_id=${item.id}`
         })
       
     }
@@ -205,7 +205,7 @@ export default class Task extends Component {
 
   getEarnPoints () {
     Taro.navigateTo({
-      url: `/moduleA/pages/earnPoints/index`
+      url: `/pages/earnPoints/index`
     })
   }
   onShareAppMessage = (res) => {

src/pages/index/index.jsx

@@ -347,7 +347,7 @@ export default class Mine extends Component {
           this.subscribe(res.data.task_id)
         }
         Taro.navigateTo({
-          url: `/moduleA/pages/darwDetailIndex/index?task_id=${res.data.task_id}`
+          url: `/pages/darwDetailIndex/index?task_id=${res.data.task_id}`
         })
       } else {
         console.log('11111111111');
@@ -359,7 +359,7 @@ export default class Mine extends Component {
             success: function (res) {
               if (res.confirm) {
                 Taro.navigateTo({
-                  url: `/moduleA/pages/earnPoints/index`
+                  url: `/pages/earnPoints/index`
                 })
               } else if (res.cancel) {
                 console.log('用户点击取消')
@@ -585,7 +585,7 @@ export default class Mine extends Component {
         }
         Taro.hideLoading()
         Taro.navigateTo({
-          url: `/moduleA/pages/upload/index?image=${file}`
+          url: `/pages/upload/index?image=${file}`
         })
       }
     })

src/moduleA/pages/invite/index.jsx

@@ -1,9 +1,9 @@
 import { Component } from 'react'
 import { View, Swiper, SwiperItem, Image, Textarea, Canvas, Button } from '@tarojs/components'
 import Taro, { getCurrentInstance, CanvasContext } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import TaroCanvasDrawer from '../../../component/taro-plugin-canvas';
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import TaroCanvasDrawer from '../../component/taro-plugin-canvas';
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Task extends Component {

src/moduleB/pages/like/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from 'react'
 import { View, Swiper, SwiperItem, Image, Textarea, Canvas, Button } from '@tarojs/components'
 import Taro, { getCurrentInstance, CanvasContext } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Task extends Component {
@@ -80,7 +80,7 @@ export default class Task extends Component {
   //选中||详情页
   toDetail (item, index, type) {
     Taro.navigateTo({
-      url: `/moduleA/pages/communityDetail/index?task_id=${item.id}`
+      url: `/pages/communityDetail/index?task_id=${item.id}`
     })
   }
   delectiImg () {

src/pages/mine/index.jsx

@@ -40,34 +40,34 @@ export default class Mine extends Component {
 
   getEarnPoints () {
     Taro.navigateTo({
-      url: `/moduleA/pages/earnPoints/index`
+      url: `/pages/earnPoints/index`
     })
   }
   wallet () {
     Taro.navigateTo({
-      url: `/moduleA/pages/wallet/index`
+      url: `/pages/wallet/index`
     })
   }
   toDetail (index) {
     switch (index) {
       case 0:
         Taro.navigateTo({
-          url: `/moduleB/pages/imageWorks/index`
+          url: `/pages/imageWorks/index`
         })
         break;
       case 1:
         Taro.navigateTo({
-          url: `/moduleB/pages/like/index`
+          url: `/pages/like/index`
         })
         break;
       case 2:
         Taro.navigateTo({
-          url: `/moduleA/pages/invite/index`
+          url: `/pages/invite/index`
         })
         break;
       case 3:
         Taro.navigateTo({
-          url: `/moduleA/pages/shareCnt/index`
+          url: `/pages/shareCnt/index`
         })
         break;
       case 4:

src/moduleB/pages/poetry/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from 'react'
 import { View, Text, Button, Image, Swiper, SwiperItem, scrollView, Input, Textarea } from '@tarojs/components'
-import * as api from '../../../service/index'
-import tool from '../../../common/tool'
-import TaroCanvasDrawer from '../../../component/taro-plugin-canvas';
+import * as api from '../../service/index'
+import tool from '../../common/tool'
+import TaroCanvasDrawer from '../../component/taro-plugin-canvas';
 import Taro, { getCurrentInstance } from '@tarojs/taro'
 import './index.less'
 
@@ -580,7 +580,7 @@ export default class collection extends Component {
                 success: function (res) {
                   if (res.confirm) {
                     Taro.navigateTo({
-                      url: `/moduleA/pages/earnPoints/index`
+                      url: `/pages/earnPoints/index`
                     })
                   } else if (res.cancel) {
 

src/moduleB/pages/point/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from 'react'
 import { View, Swiper, SwiperItem, Image, Textarea, Canvas, Button } from '@tarojs/components'
 import Taro, { getCurrentInstance, CanvasContext } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Task extends Component {

src/moduleB/pages/real/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from 'react'
 import { View, Swiper, SwiperItem, Image, Textarea, Canvas, Button } from '@tarojs/components'
 import Taro, { getCurrentInstance, CanvasContext } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Task extends Component {
@@ -49,7 +49,7 @@ export default class Task extends Component {
   }
   toRealDetail (item) {
     Taro.navigateTo({
-      url: `/moduleB/pages/realDetail/index?task_id=${item.id}`
+      url: `/pages/realDetail/index?task_id=${item.id}`
     })
   }
   onReachBottom () {

src/moduleB/pages/realDetail/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from 'react'
 import { View, RichText } from '@tarojs/components'
 import Taro, { getCurrentInstance, CanvasContext } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Task extends Component {

src/moduleA/pages/shareCnt/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from 'react'
 import { View, Text, Button, Image, scrollView, Input } from '@tarojs/components'
 import Taro, { } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Mine extends Component {

src/moduleA/pages/upload/index.jsx

@@ -2,8 +2,8 @@ import React, { Component } from 'react'
 import { View, Text, Button, Image, ScrollView, Input } from '@tarojs/components'
 import Taro, { getCurrentInstance } from '@tarojs/taro'
 import TaroCropper from 'taro-cropper';
-import tool from '../../../common/tool'
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import * as api from '../../service/index'
 
 import './index.less'
 

src/moduleA/pages/wallet/index.jsx

@@ -1,8 +1,8 @@
 import { Component } from 'react'
 import { View, Text, Button, Image, scrollView, Input } from '@tarojs/components'
 import Taro, { } from '@tarojs/taro'
-import tool from '../../../common/tool'
-import * as api from '../../../service/index'
+import tool from '../../common/tool'
+import * as api from '../../service/index'
 import './index.less'
 
 export default class Mine extends Component {
@@ -54,7 +54,7 @@ export default class Mine extends Component {
   }
   toBuyPage (e) {
     Taro.navigateTo({
-      url: `/moduleA/pages/earnPoints/index`
+      url: `/pages/earnPoints/index`
     })
   }