From 8e234d852031aa13e0f51b1fb39aa4ce3d2c4e7a Mon Sep 17 00:00:00 2001
From: jinjinjin0731 <709899428@qq.com>
Date: Tue, 19 Mar 2019 11:51:18 +0800
Subject: [PATCH] =?UTF-8?q?fix(cli):=20=E4=BF=AE=E6=94=B9=E4=BA=91?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E6=A8=A1=E6=9D=BF=E5=88=9B=E5=BB=BA=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/taro-cli/templates/wxcloud/index.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/taro-cli/templates/wxcloud/index.js b/packages/taro-cli/templates/wxcloud/index.js
index 92d2cd6a13d3..5c1f8dca7d44 100644
--- a/packages/taro-cli/templates/wxcloud/index.js
+++ b/packages/taro-cli/templates/wxcloud/index.js
@@ -55,7 +55,7 @@ module.exports = function (creater, params, helper, cb) {
   })
   creater.template(template, path.join(clientDirName, 'indexhtml'), path.join(projectClientPath, 'index.html'))
   if (typescript) {
-    creater.template(template, path.join(clientDirName, 'appjs'), path.join(projectClientPath, 'app.tsx'), {
+    creater.template(template, path.join(clientDirName, 'appjs'), path.join(sourceDir, 'app.tsx'), {
       css: currentStyleExt,
       typescript: true
     })
@@ -98,7 +98,7 @@ module.exports = function (creater, params, helper, cb) {
       css: currentStyleExt,
       typescript: true
     })
-    creater.template(template, path.join(clientDirName, 'components', 'login', 'index'), path.join(sourceDir, 'components', 'login', 'index.tsx'), {
+    creater.template(template, path.join(clientDirName, 'components', 'login', 'index'), path.join(sourceDir, 'components', 'login', 'index.weapp.tsx'), {
       css: currentStyleExt,
       typescript: true
     })
@@ -126,15 +126,17 @@ module.exports = function (creater, params, helper, cb) {
     console.log(`${chalk.green('✔ ')}${chalk.grey(`创建源码目录: ${projectName}/${clientDirName}/${src}`)}`)
     console.log(`${chalk.green('✔ ')}${chalk.grey(`创建页面目录: ${projectName}/${clientDirName}/${src}/pages`)}`)
     if (typescript) {
-      console.log(`${chalk.green('✔ ')}${chalk.grey(`创建页面 TS 文件: ${projectName}/${clientDirName}/${src}/pages/index/index.weapp.tsx`)}`)
+      console.log(`${chalk.green('✔ ')}${chalk.grey(`创建页面 TS 文件: ${projectName}/${clientDirName}/${src}/pages/index/index.tsx`)}`)
+      console.log(`${chalk.green('✔ ')}${chalk.grey(`创建页面目录: ${projectName}/${clientDirName}/${src}/components/login/index.weapp.tsx`)}`)
     } else {
-      console.log(`${chalk.green('✔ ')}${chalk.grey(`创建页面 JS 文件: ${projectName}/${clientDirName}/${src}/pages/index/index.weapp.js`)}`)
+      console.log(`${chalk.green('✔ ')}${chalk.grey(`创建页面 JS 文件: ${projectName}/${clientDirName}/${src}/pages/index/index.js`)}`)
+      console.log(`${chalk.green('✔ ')}${chalk.grey(`创建页面目录: ${projectName}/${clientDirName}/${src}/components/login/index.weapp.js`)}`)
     }
     console.log(`${chalk.green('✔ ')}${chalk.grey(`创建页面 ${currentStyleExt.toLocaleUpperCase()} 文件: ${projectName}/${clientDirName}/${src}/pages/index/${pageCSSName}`)}`)
     if (typescript) {
-      console.log(`${chalk.green('✔ ')}${chalk.grey(`创建文件: ${projectName}/${clientDirName}/${src}/app.weapp.tsx`)}`)
+      console.log(`${chalk.green('✔ ')}${chalk.grey(`创建文件: ${projectName}/${clientDirName}/${src}/app.tsx`)}`)
     } else {
-      console.log(`${chalk.green('✔ ')}${chalk.grey(`创建文件: ${projectName}/${clientDirName}/${src}/app.weapp.js`)}`)
+      console.log(`${chalk.green('✔ ')}${chalk.grey(`创建文件: ${projectName}/${clientDirName}/${src}/app.js`)}`)
     }
     console.log(`${chalk.green('✔ ')}${chalk.grey(`创建文件: ${projectName}/${clientDirName}/${src}/${appCSSName}`)}`)
     console.log(`${chalk.green('✔ ')}${chalk.grey(`创建文件: ${projectName}/${clientDirName}/${src}/index.html`)}`)