shish před 6 roky
rodič
revize
7bf543630c

+ 1 - 1
store/src/admin/official/pay.vue

@@ -35,7 +35,7 @@
 				</span>
 			</div>
 			<button v-if="$util.isEmpty(renewOption)" class="admin-button-com middle blue" @click="pageTo({
-			url: '/official/apply'
+			url: '/admin/official/apply',type:2
 		})">免费试用</button>
 			<button v-else class="admin-button-com middle blue" @click="wxPay">支付</button>
 		</div>

+ 9 - 29
store/src/constant/index.js

@@ -22,35 +22,15 @@ const envVal = {
 	firstHost: getFirstHost()
 }
 
-// 项目配置
-if (ProjectName == 'mobile') {
-	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://mall.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.mall.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
-	// #endif
-	// #ifdef MP-WEIXIN
-	envVal.formal = process.env.NODE_ENV == 'development' ? extConfig.mHost : extConfig.mHost
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? extConfig.mHost : extConfig.mHost
-	// #endif
-} else if (ProjectName == 'store') {
-	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://store.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.shop.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
-	// #endif
-	// #ifndef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://store.huaml.com' : `https://store.huaml.com`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.shop.huaml.com` : `https://api.shop.huaml.com`
-	// #endif
-} else {
-	// #ifdef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://www.huaml.com' : `${window.location.protocol}//${window.location.host}`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.www.huaml.com` : `${window.location.protocol}//api.w.${getFirstHost()}.com`
-	// #endif
-	// #ifndef H5
-	envVal.formal = process.env.NODE_ENV == 'development' ? 'http://www.huaml.com' : `https://www.huaml.com`
-	envVal.hostUrl = process.env.NODE_ENV == 'development' ? `http://api.www.huaml.com` : `https://api.www.huaml.com`
-	// #endif
-}
+// #ifdef H5
+envVal.formal = process.env.NODE_ENV == 'development' ? 'https://shop.huaml.com' : `${window.location.protocol}//${window.location.host}`
+envVal.hostUrl = process.env.NODE_ENV == 'development' ? `https://api.shop.huaml.com` : `${window.location.protocol}//api.${window.location.host}`
+// #endif
+
+// #ifdef MP-WEIXIN
+envVal.formal = process.env.NODE_ENV == 'development' ? extConfig.mHost : extConfig.mHost
+envVal.hostUrl = process.env.NODE_ENV == 'development' ? extConfig.mHost : extConfig.mHost
+// #endif
 
 function getFirstHost() {
 	let host = ''

+ 1 - 1
store/src/ext.json

@@ -4,7 +4,7 @@
     "directCommit": false,
     "ext": {
       "account": 12362,
-      "mHost": "https://api.mall.huaml.com",
+      "mHost": "https://api.shop.huaml.com",
       "imgHost": "https://img.huaml.com",
       "merchantName":"花美玲"
     }