Просмотр исходного кода

Merge remote-tracking branch 'origin/master'

jf 5 лет назад
Родитель
Сommit
1dea6de663

+ 3 - 20
ghsApp/src/pagesClient/member/detail.vue

@@ -15,18 +15,6 @@
                   </view>
                 </view>
             </view>
-            <button 
-              v-if="userInfo.isOpen === 0"
-              id="0"
-              class="invite-bt" open-type="share">
-              邀请开店
-            </button>
-            <view 
-              v-else
-              class="already-shop">
-              <i class="iconfont iconyikaidian"></i>
-              已开店
-            </view>
         </view>
         <view class="user-info_data order-wrap">
             <view class="total-blo">
@@ -50,13 +38,8 @@
           <view class="address-des_bx">
             <view>
                 <view>
-                  {{userInfo.userName}} {{userInfo.mobile}}
-                  <button
-                    id="1"
-                    open-type="share"
-                    class="admin-button-com default">
-                    关联微信
-                  </button>
+                  {{userInfo.name}} {{userInfo.mobile}}
+
                   <!-- <i class="iconfont iconweixinlaiyuan _i"></i> -->
                 </view>
                 <view>
@@ -72,7 +55,7 @@
       <view class="module-com user-open_bx">
         <view class="input-line-wrap">
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">延期付款</div>
+              <div class="tui-title">允许延期付款</div>
               <div class="switch_bx">
                 <text>已关闭</text>
                 <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" />

+ 5 - 5
mall/src/ext.json

@@ -1,11 +1,11 @@
 {
   "extEnable": true,
-  "extAppid": "wxe994a9f5fd036f69",
+  "extAppid": "wxe41bd5816affd0ba",
   "directCommit": false,
   "ext": {
-    "account": 12358,
-    "apiHost": "https://api.mall.huahb.com",
-    "imgHost": "https://img.huahb.com",
-    "merchantName":"国兰花尚"
+    "account": 0,
+    "apiHost": "http://api.shop.theflorist.cn",
+    "imgHost": "http://img.theflorist.cn",
+    "merchantName":"中花卉"
   }
 }

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/css/chunk-52e2bf62.ee0113fa.css


+ 1 - 1
pt/dist/web/index.html

@@ -43,4 +43,4 @@
 			.once .sub-title {
 				color: #ababab;
 				font-size: 12px;
-			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.389c1482.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.389c1482.js"></script></body></html>
+			}</style><link href="/css/app.6f07e55a.css" rel="preload" as="style"><link href="/css/chunk-libs.2e1e87b5.css" rel="preload" as="style"><link href="/js/app.6815e4e4.js" rel="preload" as="script"><link href="/js/chunk-libs.afac7b8c.js" rel="preload" as="script"><link href="/css/chunk-libs.2e1e87b5.css" rel="stylesheet"><link href="/css/app.6f07e55a.css" rel="stylesheet"></head><body><noscript></noscript><div id="app"><div class="once"><div class="container"><div class="title">正在加载资源</div><div class="sub-title">初次加载资源可能需要较多时间 请耐心等待</div></div><div class="footer"><a href="https://www.baidu.com/" target="_blank">花卉宝</a></div></div></div><script src="/cdn/vue/2.6.10/vue.min.js"></script><script src="/cdn/vue-router/3.1.3/vue-router.min.js"></script><script src="/cdn/vuex/3.1.1/vuex.min.js"></script><script src="/cdn/clipboard.js/2.0.4/clipboard.min.js"></script><script src="/cdn/axios/0.19.0-beta.1/axios.min.js"></script><script src="/cdn/nprogress/0.2.0/nprogress.min.js"></script><script src="/cdn/Mock.js/1.0.1-beta3/mock-min.js"></script><script src="/cdn/quill/2.0.0-dev.3/quill.min.js"></script><script src="/cdn/element-ui/2.13.0/index.js"></script><script src="/cdn/viewerjs/1.3.7/viewer.min.js"></script><script src="/cdn/echarts/4.4.0-rc.1/echarts.min.js"></script><script src="/cdn/npm/vue-echarts@4.0.2.js"></script><script src="/js/chunk-libs.afac7b8c.js"></script><script src="/js/app.6815e4e4.js"></script></body></html>

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/app.6815e4e4.js


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-1b025917.95c130cd.js


+ 1 - 1
pt/dist/web/js/chunk-2d2385e5.ca6b960d.js → pt/dist/web/js/chunk-2d2385e5.3a6fbfc3.js

@@ -1 +1 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d2385e5"],{fea1:function(e,t,n){"use strict";n.r(t);var o=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"app-list-content"},[n("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad},scopedSlots:e._u([{key:"table-column-gatheringCode",fn:function(t){var o=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(1,o.row)}}},[e._v("查看")])]}},{key:"table-column-applyCode",fn:function(t){var o=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(2,o.row)}}},[e._v("查看")])]}}])})],1)},a=[],l=n("8bc2"),r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,n=e.ctx,o=e.app;this.app=o;var a=function(){return t.$service.saasShop.shopList()};n.service({page:a}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"shopName",label:"门店名称",align:"center"},{prop:"merchantName",label:"商家",align:"center"},{prop:"shopProvince",label:"省",align:"center"},{prop:"shopCity",label:"市",align:"center",emptyText:"无"},{prop:"shopDist",label:"区",align:"center",emptyText:"无"},{prop:"gatheringCode",label:"收款二维码",align:"center"},{prop:"applyCode",label:"会员申请码",align:"center"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),o.refresh()},gotoPage:function(e,t){console.log(t);var n="http://api.pt.".concat(Object(l["getFirstHost"])(),".com"),o=null;switch(e){case 1:o="/user/gathering-code?id=".concat(t.id);break;case 2:o="/user/apply-code?id=".concat(t.id);break}window.open(n+o)}}},c=r,p=n("5d22"),i=Object(p["a"])(c,o,a,!1,null,null,null);t["default"]=i.exports}}]);
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d2385e5"],{fea1:function(e,t,n){"use strict";n.r(t);var a=function(){var e=this,t=e.$createElement,n=e._self._c||t;return n("div",{staticClass:"app-list-content"},[n("x-crud",{staticClass:"liu-crud-wrap",on:{load:e.onLoad},scopedSlots:e._u([{key:"table-column-gatheringCode",fn:function(t){var a=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(1,a.row)}}},[e._v("查看")])]}},{key:"table-column-applyCode",fn:function(t){var a=t.scope;return[n("el-button",{attrs:{type:"text"},on:{click:function(t){return e.gotoPage(2,a.row)}}},[e._v("查看")])]}}])})],1)},o=[],l=n("8bc2"),r={data:function(){return{app:null}},mounted:function(){},methods:{onLoad:function(e){var t=this,n=e.ctx,a=e.app;this.app=a;var o=function(){return t.$service.saasShop.shopList()};n.service({page:o}).set("table",{columns:[{prop:"id",label:"ID",align:"center"},{prop:"shopName",label:"门店名称",align:"center"},{prop:"merchantName",label:"商家",align:"center"},{prop:"shopProvince",label:"省",align:"center"},{prop:"shopCity",label:"市",align:"center",emptyText:"无"},{prop:"shopDist",label:"区",align:"center",emptyText:"无"},{prop:"gatheringCode",label:"收款二维码",align:"center"},{prop:"applyCode",label:"会员申请码",align:"center"}],op:{visible:!1,props:{width:150,align:"center",fixed:"right",label:"操作"},layout:[]}}).set("layout",[["slot-tabs"],["flex1","refresh-btn"],["data-table"],["flex1","pagination"]]).done(),a.refresh()},gotoPage:function(e,t){console.log(t);var n="http://api.pt.".concat(Object(l["getFirstHost"])()),a=null;switch(e){case 1:a="/user/gathering-code?id=".concat(t.id);break;case 2:a="/user/apply-code?id=".concat(t.id);break}window.open(n+a)}}},c=r,p=n("5d22"),i=Object(p["a"])(c,a,o,!1,null,null,null);t["default"]=i.exports}}]);

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
pt/dist/web/js/chunk-52e2bf62.0cb7f900.js


+ 2 - 2
pt/src/config/env.js

@@ -5,7 +5,7 @@ import { getUrlParam, getFirstHost } from '@/cool/utils';
 const routerMode = 'hash';
 
 // 图片host
-const imgHostUrl = `${window.location.protocol}//img.${getFirstHost()}.com`;
+const imgHostUrl = `${window.location.protocol}//img.${getFirstHost()}`;
 
 // 请求地址
 const baseUrl = (function() {
@@ -24,7 +24,7 @@ const baseUrl = (function() {
 		case 'development':
 			return `/${proxy}`;
 		case 'production':
-			return `${window.location.protocol}//api.pt.${getFirstHost()}.com`;
+			return `${window.location.protocol}//api.pt.${getFirstHost()}`;
 		default:
 			return '';
 	}

+ 6 - 4
pt/src/cool/utils/index.js

@@ -3,14 +3,16 @@ import { routerMode } from '@/config/env';
 export const getFirstHost = () => {
 	let host = window.location.host;
 	host = host.split('.');
-	host = host.length == 3 ? host[1] : host[0];
+	if(host.length == 3){
+		return host[1]+'.'+host[2];
+	}
 	if(process.env.NODE_ENV == 'local'){
-		return 'hhb';
+		return 'hhb.com';
 	}
 	if(process.env.NODE_ENV == 'development'){
-		return 'huaml';
+		return 'huaml.com';
 	}
-	return host;
+	return 'huaml.com';
 };
 
 export const revisePath = path => {

+ 7 - 2
pt/src/saas/shop/list.vue

@@ -47,11 +47,16 @@
 
 			<!-- 平台帐号激活 -->
 			<template #slot-activation="{scope}">
-				<div v-if="firstHost == 'huaml' || firstHost == 'huahb' ">
+				<div v-if="firstHost == 'huaml.com' || firstHost == 'huahb.com' ">
 				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/begin-auth?id=hd&authType=1`)">花店公众号激活</el-button>
 				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/begin-auth?id=hd&authType=2`)">花店小程序激活</el-button>
 				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/bind-open?id=hd&actId=6`)">花店小程序体验码</el-button>
 </div>
+<div v-else-if="firstHost == 'theflorist.cn' || firstHost == 'zhhinc.com'">
+				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/begin-auth?id=mall&authType=1`)">商城公众号激活</el-button>
+				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/begin-auth?id=mall&authType=2`)">商城小程序激活</el-button>
+				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/bind-open?id=mall&actId=6`)">商城小程序体验码</el-button>
+	</div>
 <div v-else>
 				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/begin-auth?id=ghs&authType=1`)">供货商公众号激活</el-button>
 				<el-button type="primary" size="mini" @click="bindJump(`/wx-open/begin-auth?id=ghs&authType=2`)">供货商小程序激活</el-button>
@@ -139,7 +144,7 @@ export default {
 		wxPayConfigFn() {},
 		// 绑定跳转
 		bindJump(url) {
-			let host = `http://api.pt.${getFirstHost()}.com`;
+			let host = `http://api.pt.${getFirstHost()}`;
 			window.open(host + url);
 		},
 		getWxOpen() {

+ 1 - 1
pt/src/saas/shop/shop.vue

@@ -106,7 +106,7 @@
 
             gotoPage(type,data) {
                 console.log(data)
-                let host = `http://api.pt.${getFirstHost()}.com`;
+                let host = `http://api.pt.${getFirstHost()}`;
                 let url=null
                 switch (type) {
                     case 1:

Некоторые файлы не были показаны из-за большого количества измененных файлов