From 9b8ba9615a50d28e7dd642b462d3a27892909f02 Mon Sep 17 00:00:00 2001
From: liuhongxu <liuhongxu@shopex.cn>
Date: Fri, 12 Jun 2020 14:59:16 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=20=E4=BF=AE=E5=A4=8D=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E5=90=8Ebug=E3=80=81=E8=B0=83=E6=95=B4=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dev.sh                                              | 13 ++++++++++++-
 package.json                                        |  1 +
 .../comps => components/orderItem}/order-item.js    |  0
 .../comps => components/orderItem}/order-item.scss  |  2 +-
 src/pages/cart/espier-checkout.js                   |  2 +-
 src/subpage/pages/trade/comps/detail-item.js        |  4 ++--
 src/subpage/pages/trade/comps/item.js               |  2 +-
 7 files changed, 18 insertions(+), 6 deletions(-)
 rename src/{subpage/pages/trade/comps => components/orderItem}/order-item.js (100%)
 rename src/{subpage/pages/trade/comps => components/orderItem}/order-item.scss (95%)

diff --git a/dev.sh b/dev.sh
index 353bbcc26..fc494ead5 100644
--- a/dev.sh
+++ b/dev.sh
@@ -6,7 +6,7 @@
  # @FilePath: /unite-vshop/dev.sh
 # @Date: 2020-06-10 10:15:51
  # @LastEditors: Arvin
- # @LastEditTime: 2020-06-11 10:32:14
+ # @LastEditTime: 2020-06-12 14:57:52
 ### 
 #/usr/bash
 
@@ -95,6 +95,17 @@ APP_CUSTOM_SERVER='${custom_server}'
 APP_HOME_PAGE='${home_page}'
 ' > ./.env
 
+if["$(uname)"=="Darwin"];then
+
 echo "npm run dev:weapp"
 
 npm run dev:weapp
+
+elif["$(expr substr $(uname -s) 1 10)"=="MINGW32_NT"];then
+
+echo "npm run dev:weapp:windows"
+
+npm run dev:weapp:windows
+
+fi
+
diff --git a/package.json b/package.json
index 9fe1a456d..4b42c3ef1 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
 		"build:h5": "taro build --type h5",
 		"build:rn": "taro build --type rn",
 		"dev:weapp": "NODE_ENV=production npm run build:weapp -- --watch",
+		"dev:weapp:windows": "set NODE_ENV=production && npm run build:weapp -- --watch",
 		"dev:swan": "npm run build:swan -- --watch",
 		"dev:alipay": "npm run build:alipay -- --watch",
 		"dev:tt": "npm run build:tt -- --watch",
diff --git a/src/subpage/pages/trade/comps/order-item.js b/src/components/orderItem/order-item.js
similarity index 100%
rename from src/subpage/pages/trade/comps/order-item.js
rename to src/components/orderItem/order-item.js
diff --git a/src/subpage/pages/trade/comps/order-item.scss b/src/components/orderItem/order-item.scss
similarity index 95%
rename from src/subpage/pages/trade/comps/order-item.scss
rename to src/components/orderItem/order-item.scss
index ca038968a..fdfe2ca39 100644
--- a/src/subpage/pages/trade/comps/order-item.scss
+++ b/src/components/orderItem/order-item.scss
@@ -1,4 +1,4 @@
-@import "../../../../style/imports";
+@import "../../style/imports";
 
 .order-item {
   display: flex;
diff --git a/src/pages/cart/espier-checkout.js b/src/pages/cart/espier-checkout.js
index 9af2c01b6..9405647d6 100644
--- a/src/pages/cart/espier-checkout.js
+++ b/src/pages/cart/espier-checkout.js
@@ -13,7 +13,7 @@ import _cloneDeep from 'lodash/cloneDeep'
 import CheckoutItems from './checkout-items'
 import PaymentPicker from './comps/payment-picker'
 // import DrugInfo from './drug-info'
-import OrderItem from '../../subpage/pages/trade/comps/order-item'
+import OrderItem from '../../components/orderItem/order-item'
 
 import './espier-checkout.scss'
 
diff --git a/src/subpage/pages/trade/comps/detail-item.js b/src/subpage/pages/trade/comps/detail-item.js
index aaf5395f0..b101d3574 100644
--- a/src/subpage/pages/trade/comps/detail-item.js
+++ b/src/subpage/pages/trade/comps/detail-item.js
@@ -2,7 +2,7 @@ import Taro, { Component } from '@tarojs/taro'
 import { View, Text } from '@tarojs/components'
 import { AtButton } from 'taro-ui'
 import { copyText } from '@/utils'
-import OrderItem from  './order-item'
+import OrderItem from  '../../../../components/orderItem/order-item'
 
 import './detail-item.scss'
 
@@ -12,7 +12,7 @@ export default class DetailItem extends Component {
   }
 
   static defaultProps = {
-    // customHeader: false,
+    // customHeader: false
     customFooter: false,
     // customRender: false,
     // noHeader: false,
diff --git a/src/subpage/pages/trade/comps/item.js b/src/subpage/pages/trade/comps/item.js
index 61ba70d07..a939f9e45 100644
--- a/src/subpage/pages/trade/comps/item.js
+++ b/src/subpage/pages/trade/comps/item.js
@@ -3,7 +3,7 @@ import { View, Text, Button } from '@tarojs/components'
 import { connect } from "@tarojs/redux";
 import { Price } from '@/components'
 import { classNames } from '@/utils'
-import OrderItem from './order-item'
+import OrderItem from '../../../../components/orderItem/order-item'
 
 import './item.scss'