Merge branch 'shining-project' into dev

htmldev/accessmanage/src/api/index.js

@@ -3,11 +3,9 @@ import axios from 'axios'
 import { Message } from 'element-ui'
 import store from '../store/index'
 import { getToken } from '@/utils/auth'
-import { envDomain } from '@/utils/.env.domain'
 
 // axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'
-
-axios.defaults.baseURL = (process.env.VUE_APP_ISPROXY * 1 ? '' : envDomain.API_DOMAIN) + '/api'
+axios.defaults.baseURL = (process.env.VUE_APP_ISPROXY * 1 ? '' : '') + '/api'
 axios.defaults.timeout = 20000
 
 axios.interceptors.request.use(config => {

htmldev/shiningWxMini/components/business-detail-large/index.json

@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "van-action-sheet": "@vant/weapp/action-sheet/index"
+    "van-action-sheet": "@vant/weapp/action-sheet/index",
+    "van-icon": "@vant/weapp/icon/index"
   }
 }

htmldev/shiningWxMini/components/business-detail-large/index.scss

@@ -18,6 +18,16 @@
     height: 112rpx;
   }
 
+  .business-name-icon {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 112rpx;
+    height: 112rpx;
+    font-size: 40rpx;
+    color: rgb(139, 157, 177);
+  }
+
   .value {
     width: 484rpx;
     margin-right: 62rpx;

htmldev/shiningWxMini/components/business-detail-large/index.wxml

@@ -1,4 +1,13 @@
 <view class="business-info">
+  <view
+    class="box">
+    <van-icon
+      custom-class="business-name-icon"
+      name="manager" />
+    <view
+      class="value">供应商名称：{{shopDetail.user_name}}
+    </view>
+  </view>
   <view
     class="box"
     bind:tap="openLocationBridge"

htmldev/shiningWxMini/pages/goodsDetail/goodsDetail.js

@@ -89,6 +89,9 @@ Page({
    */
   onShareAppMessage() {
 
+  },
+  bindCallBack() {
+    this.fetchProductDetail()
   },
   async fetchProductDetail() {
     try {

htmldev/shiningWxMini/pages/goodsDetail/goodsDetail.json

@@ -3,5 +3,5 @@
     "customer-tab": "../../components/customer-tab/index",
     "business-detail-large": "../../components/business-detail-large"
   },
-  "navigationBarTitleText": "预售商品"
+  "navigationBarTitleText": "商品详情"
 }

htmldev/shiningWxMini/project.config.json

@@ -53,7 +53,8 @@
     "useCompilerPlugins": [
       "sass"
     ],
-    "useStaticServer": true
+    "useStaticServer": true,
+    "condition": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.15.0",

htmldev/shiningWxMini/utils/config.js

@@ -1,13 +1,20 @@
-const envDomain = {
-  // apiDomain: 'https://shining.codedreamit.com',
-  // h5Domain: 'https://shining-h5.codedreamit.com',
-  // vrDomain: 'https://shining-h5-1.codedreamit.com'
-  // ---------------华丽的分割线---------------
+// 测试环境
+const devDomain = {
+  apiDomain: 'https://shining.codedreamit.com',
+  h5Domain: 'https://shining-h5.codedreamit.com',
+  vrDomain: 'https://shining-h5-1.codedreamit.com'
+}
+
+// 生产环境
+const prodDomain = {
   apiDomain: 'https://shining-api.chazhujianghu.com',
   h5Domain: 'https://shining-h5.chazhujianghu.com',
   vrDomain: 'https://shining-h5-1.chazhujianghu.com'
 }
 
 module.exports = {
-  envDomain
+  envDomain: {
+    // ...devDomain
+    ...prodDomain
+  }
 }