shish 4 жил өмнө
parent
commit
c1b0224efb

+ 4 - 4
ghs/vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里,修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'http://api.shop.hzghd.com';
+const proxyTarget = 'https://api.shop.wixhb.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -14,11 +14,11 @@ function resolve(dir) {
  * **/
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `http://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }else{
-	hostUrl = `https://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }
 
 const cdn = {

+ 0 - 34
ghsApp/src/admin/jc/contact.vue

@@ -1,34 +0,0 @@
-<template>
-  <div class="app-content">
-    <div>
-      <video src="https://api.shop.hzghd.com/contact.mp4" ></video>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "jc",
-  components: {},
-  data() {
-    return {
-    };
-  },
-  onLoad() {
-  },
-  onShow() {
-  },
-  methods: {
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.app-content {
-    div{
-        padding-top:50rpx;
-        margin:0 auto;
-        text-align: center;
-    }
-}
-</style>

+ 13 - 10
ghsApp/src/admin/jc/index.vue

@@ -2,22 +2,19 @@
   <div class="app-content">
     <div>
         <view v-for="(item, index) in videoList" :key="index">
-            <image mode="aspectFit" :src="`${constant.imgUrl}/common/video_icon.png?v=1`"></image><view @click="goToDetail(item)" class="text">{{item.title}}</view>
+            <image mode="aspectFit" :src="`${constant.imgUrl}/common/video_icon.png`"></image><view @click="goToDetail(item)" class="text">{{item.title}}</view>
         </view>
     </div>
   </div>
 </template>
-
 <script>
+import { getJcList} from "@/api/jc";
 export default {
   name: "jc",
   components: {},
   data() {
     return {
-        videoList:[
-            {title:'抖音搜索销花宝,查看完整视频教程',page:'/admin/jc/contact'},
-            {title:'抖音搜索销花宝,查看完整视频教程2',page:'/admin/jc/contact'}
-        ]
+        videoList:[]
     };
   },
   onLoad() {
@@ -26,7 +23,13 @@ export default {
   },
   methods: {
       goToDetail(item){
-        this.$util.pageTo({url: item.page})
+        this.$util.pageTo({url: '/admin/jc/video',query:{url:item.url}})
+      },
+      init(){
+        let that = this
+        getJcList().then(res => {
+            that.videoList = res.data.list
+        });
       }
   },
 };
@@ -35,16 +38,16 @@ export default {
 <style lang="scss" scoped>
 .app-content {
     div{
-        padding-top:50rpx;
+        padding:50rpx 0 50rpx 0;
         image{
             width:32rpx;
             height:32rpx;
             float:left;
-            margin:8rpx 0 0 20rpx;
+            margin:8rpx 0 0 80rpx;
         }
         .text{
             color:rgb(94, 92, 92);
-            margin:0 0 35rpx 62rpx;
+            margin:0 0 40rpx 120rpx;
             font-size:35rpx;
         }
     }

+ 48 - 0
ghsApp/src/admin/jc/video.vue

@@ -0,0 +1,48 @@
+<template>
+  <div class="app-content">
+    <div>
+      <video id="myVideo" :src="videoUrl" ></video>
+      <view>点右下角全屏观看更清晰</view>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "jc",
+  components: {},
+  data() {
+    return {
+      videoUrl:''
+    };
+  },
+  onLoad() {
+    this.videoContext = uni.createVideoContext('myVideo')
+  },
+  onShow() {
+  },
+  methods: {
+    fullScreen() {
+      this.videoContext.requestFullScreen({direction: 0})
+    },
+    init(){
+      let extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
+      this.videoUrl = extConfig.apiHost+'/jc/'+this.option.url
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-content {
+    div{
+        padding-top:50rpx;
+        margin:0 auto;
+        text-align: center;
+        view{
+          margin-top:20rpx;
+          font-size:30rpx;
+        }
+    }
+}
+</style>

+ 5 - 0
ghsApp/src/api/jc/index.js

@@ -0,0 +1,5 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const getJcList = data => {
+	return https.get('/jc/list', data)
+}

+ 6 - 6
ghsApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wx21b7c3ef12082099",
+  "extAppid": "wxcf32b3f0684c2433",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
-    "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
-    "name":"花掌柜"
+    "account": 12358,
+    "apiHost": "https://api.shop.wixhb.com",
+    "socketApiHost": "api.shop.wixhb.com",
+    "imgHost": "https://img.wixhb.com",
+    "name":"销花宝"
   }
 }

+ 7 - 1
ghsApp/src/manifest.json

@@ -83,15 +83,21 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(销花宝) wxcf32b3f0684c2433 开发(花掌柜) wx21b7c3ef12082099 */
     "mp-weixin" : {
-        "appid" : "wx21b7c3ef12082099",
+        "appid" : "wxcf32b3f0684c2433",
         "setting" : {
             "urlCheck" : false
         },
+		"optimization" : {
+			"subPackages" : true
+		},
         "usingComponents" : true,
         "permission" : {
             "scope.userLocation" : {
                 "desc" : "请点击确定"
             }
+        },
+        "optimization": {  
+            "subPackages": true  
         }
     },
     "mp-alipay" : {

+ 1 - 1
ghsApp/src/pages.json

@@ -138,7 +138,7 @@
 			"root": "admin/jc",
 			"pages": [
 				{"path": "index","style": {"navigationBarTitleText": "新手使用教程"}},
-				{"path": "contact","style": {"navigationBarTitleText": "联系客服方法"}}
+				{"path": "video","style": {"navigationBarTitleText": "播放视频"}}
 			]
 		},
 		{

+ 1 - 5
ghsApp/src/pagesOrder/detail.vue

@@ -36,7 +36,7 @@
 					<view>{{ detailInfo.cgInfo.orderSn }}</view>
 				</view>
 				<view class="order-info_box">
-					<view>开单员:</view>
+					<view>开单员:</view>
 					<view>{{ detailInfo.shopAdminName }}</view>
 				</view>
 				<view class="order-info_box">
@@ -55,10 +55,6 @@
 					<view v-if="detailInfo.status != 1 && detailInfo.status!=5">{{ detailInfo.payWay==0?'微信':detailInfo.payWay==1?'支付宝':detailInfo.payWay==4?'现金':detailInfo.payWay==5?'银行卡':'--' }}</view>
 					<view v-else>--</view>
 				</view>
-				<view class="order-info_box">
-					<view>配送方式:</view>
-					<view>{{ detailInfo.sendType==1?'待确认':detailInfo.sendType==2?'自取':detailInfo.sendType==3?'本店送':detailInfo.sendType==4?'快递配送':'--' }}</view>
-				</view>
 				<view class="order-info_box">
 					<view>订单状态:</view>
 					<view>{{ detailInfo.status==1?'待确认':detailInfo.status==2?'待配送':detailInfo.status==3?'配送中':detailInfo.status==4?'已完成':detailInfo.status==5?'已取消':'已退款' }}</view>

+ 6 - 6
ghsApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.wixhb.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

+ 4 - 4
hd/vue.config.js

@@ -3,7 +3,7 @@ const path = require('path');
 const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里,修改后需要重新运行npm run serve shish 2021.4.12
-const proxyTarget = 'http://api.shop.huaml.com';
+const proxyTarget = 'https://api.shop.huahb.cn';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -11,11 +11,11 @@ function resolve(dir) {
 
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `http://img.huaml.com/`;
+	hostUrl = `https://img.huahb.cn/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.huaml.com/`;
+	hostUrl = `https://img.huahb.cn/`;
 }else{
-	hostUrl = `https://img.huaml.com/`;
+	hostUrl = `https://img.huahb.cn/`;
 }
 const cdn = {
 	dev: {

+ 29 - 3
hdApp/src/admin/home/me.vue

@@ -131,6 +131,15 @@
               <div class="tui-title">我的优惠券</div>
             </tui-list-cell>
 
+
+            <tui-list-cell @click="pageTo({ url: '/admin/jc/index' })" class="line-cell" :hover="false" :arrow="true">
+              <div class="tui-title">新手教程</div>
+            </tui-list-cell>
+
+            <tui-list-cell @click="getCustomService()" class="line-cell" :hover="false" :arrow="true">
+              <div class="tui-title">联系客服</div>
+            </tui-list-cell>
+
           </view>
         </view>
       </view>
@@ -157,7 +166,6 @@ import { getUser } from "@/utils/auth";
 import { list } from "@/mixins";
 import { mapGetters } from "vuex";
 export default {
-  // 我的
   name: "Me",
   components: {
     AppAvatarModule,
@@ -178,13 +186,31 @@ export default {
     this.init()
   },
   onShow () {
-    // this.init()
     if(uni.getStorageSync('switchTabQuery').refresh == '1') {
       this.init()
       uni.removeStorageSync('switchTabQuery')
     }
   },
   methods: {
+		getCustomService(){
+			let self = this;
+			uni.showModal({
+				title: "客服电话微信",
+				content: "15280215347",
+				cancelText: "取消",
+				confirmText: "复制",
+				success: function (res) {
+					if (res.confirm) {
+						uni.setClipboardData({
+							data: "15280215347",
+							success: function() {
+								self.$msg("已复制")
+							}
+						});
+					}
+				},
+			})
+		},
     shopShow () {
       this.shopId = this.getLoginInfo.shopId;
       this.$refs.dorpdownSelect.dropdownShow = true;
@@ -297,7 +323,7 @@ export default {
     }
   }
   & .me-shop_box {
-    padding: 50upx 20px 0;
+    padding: 50upx 20px 50rpx;
     box-sizing: border-box;
     & .me-shop_content {
       position: relative;

+ 55 - 0
hdApp/src/admin/jc/index.vue

@@ -0,0 +1,55 @@
+<template>
+  <div class="app-content">
+    <div>
+        <view v-for="(item, index) in videoList" :key="index">
+            <image mode="aspectFit" :src="`${constant.imgUrl}/common/video_icon.png`"></image><view @click="goToDetail(item)" class="text">{{item.title}}</view>
+        </view>
+    </div>
+  </div>
+</template>
+<script>
+import { getJcList} from "@/api/jc";
+export default {
+  name: "jc",
+  components: {},
+  data() {
+    return {
+        videoList:[]
+    };
+  },
+  onLoad() {
+  },
+  onShow() {
+  },
+  methods: {
+      goToDetail(item){
+        this.$util.pageTo({url: '/admin/jc/video',query:{url:item.url}})
+      },
+      init(){
+        let that = this
+        getJcList().then(res => {
+            that.videoList = res.data.list
+        });
+      }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-content {
+    div{
+        padding:50rpx 0 50rpx 0;
+        image{
+            width:32rpx;
+            height:32rpx;
+            float:left;
+            margin:8rpx 0 0 80rpx;
+        }
+        .text{
+            color:rgb(94, 92, 92);
+            margin:0 0 40rpx 120rpx;
+            font-size:35rpx;
+        }
+    }
+}
+</style>

+ 48 - 0
hdApp/src/admin/jc/video.vue

@@ -0,0 +1,48 @@
+<template>
+  <div class="app-content">
+    <div>
+      <video id="myVideo" :src="videoUrl" ></video>
+      <view>点右下角全屏观看更清晰</view>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "jc",
+  components: {},
+  data() {
+    return {
+      videoUrl:''
+    };
+  },
+  onLoad() {
+    this.videoContext = uni.createVideoContext('myVideo')
+  },
+  onShow() {
+  },
+  methods: {
+    fullScreen() {
+      this.videoContext.requestFullScreen({direction: 0})
+    },
+    init(){
+      let extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
+      this.videoUrl = extConfig.apiHost+'/jc/'+this.option.url
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-content {
+    div{
+        padding-top:50rpx;
+        margin:0 auto;
+        text-align: center;
+        view{
+          margin-top:20rpx;
+          font-size:30rpx;
+        }
+    }
+}
+</style>

+ 5 - 0
hdApp/src/api/jc/index.js

@@ -0,0 +1,5 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const getJcList = data => {
+	return https.get('/jc/list', data)
+}

+ 6 - 6
hdApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe4675bab299a52f7",
+  "extAppid": "wx0d42f5f1dcb3a370",
   "directCommit": false,
   "ext": {
-    "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
-    "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
-    "name":"花美玲"
+    "account": 12358,
+    "apiHost": "https://api.shop.huahb.cn",
+    "socketApiHost": "api.shop.huahb.cn",
+    "imgHost": "https://img.huahb.cn",
+    "name":"花惠宝"
   }
 }

+ 1 - 1
hdApp/src/manifest.json

@@ -84,7 +84,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(花惠宝) wx0d42f5f1dcb3a370 开发(花美玲) wxe4675bab299a52f7 */
     "mp-weixin" : {
-        "appid" : "wxe4675bab299a52f7",
+        "appid" : "wx0d42f5f1dcb3a370",
         "setting" : {
             "urlCheck" : false
         },

+ 8 - 1
hdApp/src/pages.json

@@ -158,7 +158,7 @@
 				{
 					"path": "official/apply",
 					"style": {
-						"navigationBarTitleText": "完善店铺信息"
+						"navigationBarTitleText": "完善我的信息"
 					}
 				},
 				{
@@ -984,6 +984,13 @@
 				}
 			]
 		},
+		{
+			"root": "admin/jc",
+			"pages": [
+				{"path": "index","style": {"navigationBarTitleText": "新手使用教程"}},
+				{"path": "video","style": {"navigationBarTitleText": "播放视频"}}
+			]
+		},
 		{
 			"root": "admin/clear",
 			"pages": [

+ 115 - 0
hdApp/src/pagesPurchase/components/wangCg.vue

@@ -0,0 +1,115 @@
+<template>
+  <view class="model" v-if="show">
+    <image :src="`${constant.imgUrl}/ghs/home/deserve.png`" class="noData_img"></image>
+    <view class="freeApply" @click="learnCg" style="margin:50rpx auto 50rpx auto">快速了解采购流程</view>
+    <view class="freeApply" @click="apply">去采购</view>
+  </view>
+</template>
+<script>
+export default {
+  props: {
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    authShow: {
+      type: Boolean,
+      default: false,
+    }
+  },
+  watch: {
+  },
+  data() {
+    return {
+      constant: this.$constant,
+      experCode: ''
+    };
+  },
+  methods: {
+    learnCg(){
+        this.$util.pageTo({url: '/admin/jc/video',query:{url:'cg.mp4'}})
+    },
+    apply() {
+      this.$emit('bthClick')
+    },
+    rightClick() {
+      this.$emit('comfirm', this.experCode)
+    }
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.model {
+  position: fixed;
+  z-index: 9999;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.6);
+  color: #fff;
+  overflow: hidden;
+  text-align: center;
+  & > .noData_img {
+    width: 318upx;
+    height: 318upx;
+    margin: 250upx auto 0;
+  }
+  & > .no_data_text {
+    font-size: 32px;
+    color: #ffffff;
+    text-align: center;
+    margin: 50upx 0;
+  }
+  & > .freeApply {
+    width: 370px;
+    height: 80px;
+    line-height: 88upx;
+    background: linear-gradient(90deg, #3385ff, #33b0ff);
+    border-radius: 44px;
+    margin: 0 auto;
+    font-size: 30px;
+    color: #ffffff;
+    text-align: center;
+  }
+  &>.experience{
+    margin-top: 40upx;
+    color: #fff;
+    font-size: 30upx;
+  }
+  &>.experFrame{
+    margin-top: 50upx;
+    height: 50upx;
+    &>view{
+      margin: 0 auto;
+      &>.experInput{
+        height: 70upx;
+        width: 250upx;
+        display: inline-block;
+        vertical-align: middle;
+        border-radius: 8upx;
+        background-color: #fff;
+        border: 1px solid #ccc;
+        color: #666;
+        padding-left: 20upx;
+        box-sizing: border-box;
+        text-align: left;
+      }
+      &>text{
+        display: inline-block;
+        line-height: 70upx;
+        padding: 0 20upx;
+        background-color: #3385FF;
+        vertical-align: middle;
+        font-size: 30upx;
+        margin-left: 20upx;
+      }
+    }
+  }
+}
+</style>

+ 4 - 7
hdApp/src/pagesPurchase/ghsProduct.vue

@@ -7,7 +7,7 @@
         <view class="shop_info">
           <view class="shop_title">{{pageInfo.name}}</view>
           <view class="shop_intro">
-			  <text v-if="pageInfo.giveDiscount >= 1" style="margin-right: 20upx;">已采购:{{pageInfo.expendAmount || '0.00'}}</text>
+			  <text v-if="pageInfo.giveDiscount >= 1 || Number(pageInfo.giveDiscount) <= 0" style="margin-right: 20upx;">已采购:{{pageInfo.expendAmount || '0.00'}}</text>
 			  <text v-else style="margin-right: 20upx;color:red;font-weight:700">下单享{{shareDiscount}}折</text>
 			  <text>欠款:{{pageInfo.debtAmount || '0.00'}}</text></view>
         </view>
@@ -91,7 +91,7 @@
 		>
 		</modal-module>
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" ></FooterCart>
-		<noneHd :show.sync="notOpenShop" title=".." btnText="我要采购" @bthClick="toPage"></noneHd>
+		<wangCg :show.sync="notOpenShop" @bthClick="toPage"></wangCg>
     	<sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
 	</view>
 </template>
@@ -105,15 +105,12 @@ import GoodsCommondity from "@/components/module/app-goods-commodity";
 import PxClassCommondity from "@/components/module/app-pxClass-commodity";
 import FooterCart from "@/components/module/app-footer-cart";
 import ModalModule from "@/components/plugin/modal";
-import noneHd from "@/components/none-hd";
+import wangCg from "./components/wangCg";
 import allMoreSelectInput from "@/components/module/allMoreSelectInput";
 import allMoreSelectInputMins from "@/mixins/allMoreSelectInput";
-import {mapActions, mapGetters} from "vuex";
 import { COMMODITY_TYPE } from "@/utils/declare";
 import productMins from "@/mixins/product";
 import { getGhsDataApi, ghsInfo } from "@/api/ghs/index";
-import { getShop } from '@/api/common/index'
-// import suitProductMins from "@/mixins/ghsProduct";
 import SelPopup from "@/components/sel-popup.vue";
 export default {
 	name: "cgProduct", // 开单
@@ -123,7 +120,7 @@ export default {
 		AppWrapperEmpty,
 		Commondity,
 		ModalModule,
-		FooterCart,allMoreSelectInput,PxClassCommondity,GoodsCommondity,noneHd,SelPopup
+		FooterCart,allMoreSelectInput,PxClassCommondity,GoodsCommondity,wangCg,SelPopup
 	},
 	props: {
 		ghsShopAdminId:{

+ 6 - 6
hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://img.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('https://img.huahb.cn/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

+ 5 - 5
mallApp/src/ext.json

@@ -1,12 +1,12 @@
 {
   "extEnable": true,
-  "extAppid": "wxe41bd5816affd0ba",
+  "extAppid": "wx99a1dfc4171efb42",
   "directCommit": false,
   "ext": {
     "account": 0,
-    "apiHost": "https://api.shop.theflorist.cn",
-    "socketApiHost": "api.shop.theflorist.cn",
-    "imgHost": "https://img.theflorist.cn",
-    "name":"花卉"
+    "apiHost": "https://api.shop.zhiguanhua.cn",
+    "socketApiHost": "api.shop.zhiguanhua.cn",
+    "imgHost": "https://img.zhiguanhua.cn",
+    "name":"花卉"
   }
 }

+ 1 - 1
mallApp/src/manifest.json

@@ -83,7 +83,7 @@
     "quickapp" : {},
     /* 小程序特有相关 线上(花卉宝) wx99a1dfc4171efb42 开发(中花卉) wxe41bd5816affd0ba */
     "mp-weixin" : {
-        "appid" : "wxe41bd5816affd0ba",
+        "appid" : "wx99a1dfc4171efb42",
         "setting" : {
             "urlCheck" : false
         },

+ 6 - 6
mallApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot');
-  src: url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
-  url('https://img.theflorist.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
+  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot');
+  src: url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.eot?#iefix') format('embedded-opentype'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff2') format('woff2'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.woff') format('woff'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.ttf') format('truetype'),
+  url('https://img.zhiguanhua.cn/iconfont/font_1525256_6243f1wxe9f.svg#iconfont') format('svg');
 }
 
 .iconfont {

+ 4 - 4
pt/vue.config.js

@@ -4,7 +4,7 @@ const isProduction = process.env.NODE_ENV === 'production';
 
 //http和https切换请修改这里,修改后需要重新运行 npm run serve 即可 shish 2021.4.12
 const proxyTarget =
-	process.env.NODE_ENV == 'local' ? 'http://api.pt.huaml.com' : 'http://api.pt.huaml.com';
+	process.env.NODE_ENV == 'local' ? 'https://api.pt.wixhb.com' : 'https://api.pt.wixhb.com';
 
 function resolve(dir) {
 	return path.join(__dirname, dir);
@@ -15,11 +15,11 @@ function resolve(dir) {
  * **/
 let hostUrl = ``;
 if(process.env.NODE_ENV == 'development'){
-	hostUrl = `http://img.hzghd.com/`;
+	hostUrl = `http://img.wixhb.com/`;
 }else if(process.env.NODE_ENV == 'local'){
-	hostUrl = `http://img.hzghd.com/`;
+	hostUrl = `http://img.wixhb.com/`;
 }else{
-	hostUrl = `https://img.hzghd.com/`;
+	hostUrl = `https://img.wixhb.com/`;
 }
 
 const cdn = {