shish 4 жил өмнө
parent
commit
41a43a78e5

+ 0 - 37
ghsApp/src/admin/book/addCustomer.vue

@@ -1,37 +0,0 @@
-<template>
-	<view class="app-content">
-        <view class="book_banner">
-            <image class="slide" :src="`${constant.imgUrl}/book/demo1.png`" mode="aspectFit"></image>
-        </view>
-	</view>
-</template>
-<script>
-export default {
-	name: "book-index",
-	components: {
-	},
-	mixins: [],
-	data() {
-		return {
-		};
-	},
-	onShow() {
-
-	},
-	methods: {
-		init() {
-
-		}
-	}
-};
-</script>
-<style lang="scss" scoped>
-.app-content{
-    .book_banner{
-        .slide{
-            width:750rpx;
-            height:4500rpx;
-        }
-    }
-}
-</style>

+ 116 - 0
ghsApp/src/admin/book/detail.vue

@@ -0,0 +1,116 @@
+<template>
+	<view class="app-content">
+
+		<view class="list" v-for="(item, index) in bookList" :key="index">
+
+			<view v-if="item.style == 'title'">
+				<view class="title">{{item.value}}</view>
+			</view>
+
+			<view v-if="item.style == 'info'">
+				<view class="info">{{item.value}}</view>
+			</view>
+
+			<view v-if="item.style == 'smallTitle'">
+				<view class="smallTitle">{{item.value}}</view>
+			</view>
+
+			<view v-if="item.style == 'video'">
+				<view class="video"><video id="myVideo" :src="`${prefixUrl}${item.value}`" object-fit="contain" style="width:700rpx;height:1100rpx;"></video></view>
+			</view>
+
+			<view v-if="item.style == 'image'">
+				<image class="image" :src="`${constant.imgUrl}${item.value}`" mode="widthFix"></image>
+			</view>
+
+			<view v-if="item.style == 'button'">
+				<view class="book-button"><button @click="goTo(item)" class="admin-button-com mini blue">{{item.value}}</button></view>
+			</view>
+
+		</view>
+
+	</view>
+</template>
+<script>
+import { getBookDetail} from "@/api/book";
+export default {
+	name: "book-what",
+	components: {
+	},
+	mixins: [],
+	data() {
+		return {
+			bookList:[],
+			prefixUrl:'',
+			pageTitle:''
+		};
+	},
+	onLoad() {
+
+		let extConfig = wx.getExtConfigSync ? wx.getExtConfigSync() : {}
+		this.prefixUrl = extConfig.apiHost+'/'
+
+		this.videoContext = uni.createVideoContext('myVideo')
+	},
+	onShow() {
+	},
+  	onShareAppMessage(res) {
+		return {
+			title: this.pageTitle,
+			desc: "",
+			imgUrl: "",
+			path: "admin/book/detail?id="+this.option.id,
+		}
+	},
+	methods: {
+		goTo(item){
+			this.$util.pageTo({ url: item.page})
+		},
+		init(){
+			let that = this
+            getBookDetail({id:this.option.id}).then(res => {
+                that.bookList = res.data.list
+                that.bookList.forEach((item,key) => {
+                if(item.style == 'title'){
+						this.pageTitle = item.value
+                    	uni.setNavigationBarTitle({title: item.value})
+                }
+              })
+
+            });
+		}
+	},
+};
+</script>
+<style lang="scss" scoped>
+.app-content{
+	padding:20rpx 20rpx 10rpx 20rpx;
+    .title{
+		font-weight: bold;
+		font-size:40rpx;
+		margin-bottom:22rpx;
+	}
+	.smallTitle{
+		font-weight: bold;
+		font-size:30rpx;
+		font-weight: bold;
+		margin:25rpx 0 25rpx 0;
+	}
+	.info{
+    	font-size:30rpx;
+		margin-bottom:20rpx;
+	}
+	.image{
+		width:100%;
+		margin-bottom:20rpx;
+	}
+	.video{
+		margin:0 auto;
+        text-align: center;
+		margin-bottom:10rpx;
+	}
+	.book-button{
+		margin-bottom:15rpx;
+	}
+}
+</style>

+ 0 - 32
ghsApp/src/admin/book/firstUse.vue

@@ -1,32 +0,0 @@
-<template>
-	<view class="app-content">
-        销花宝,鲜花批发管理系统
-        助力商家高效管理店铺,实现传统店铺转型升级。涵盖销售开单、进货采购、微会员、自动改价、云打印、库存盘点、业绩分析、线上商城的功能。手机、平板、电脑三端数据实时同步使用,让你轻松告别手写开单、手工计账等传统操作,随时生成报表,赚多赚少,库存剩余一目了然。
-        <image class="slide" :src="`${constant.imgUrl}/book/banner1.png`" mode="aspectFit"></image>
-	</view>
-</template>
-<script>
-export default {
-	name: "book-what",
-	components: {
-	},
-	mixins: [],
-	data() {
-		return {
-		};
-	},
-	onShow() {
-
-	},
-	methods: {
-		init() {
-
-		}
-	}
-};
-</script>
-<style lang="scss" scoped>
-.app-content{
-    font-size:30rpx;
-}
-</style>

+ 11 - 75
ghsApp/src/admin/book/index.vue

@@ -7,13 +7,14 @@
             <view v-for="(item, index) in book" :key="index" class="item">
             <view v-for="(item, index) in book" :key="index" class="item">
                 <view class="category"><image class="icon" :src="`${constant.imgUrl}${item.icon}`"></image><text>{{item.class}}</text></view>
                 <view class="category"><image class="icon" :src="`${constant.imgUrl}${item.icon}`"></image><text>{{item.class}}</text></view>
                 <view v-for="(it, idx) in item.list" :key="idx" class="book-item">
                 <view v-for="(it, idx) in item.list" :key="idx" class="book-item">
-                    <view @click="pageTo(it.page)">{{it.title}}</view>
+                    <view @click="goDetail(it)">{{it.title}}</view>
                 </view>
                 </view>
             </view>
             </view>
         </view>
         </view>
 	</view>
 	</view>
 </template>
 </template>
 <script>
 <script>
+import { getBookList} from "@/api/book";
 export default {
 export default {
 	name: "book-index",
 	name: "book-index",
 	components: {
 	components: {
@@ -21,86 +22,21 @@ export default {
 	mixins: [],
 	mixins: [],
 	data() {
 	data() {
 		return {
 		return {
-            book:[
-                {class:'开始',icon:'/book/begin.png','list':[
-                    {title:'销花宝是什么',page:'/admin/book/what'},
-                    {title:'如何申请使用',page:''},
-                    {title:'首次使用的准备工作有哪些',page:''},
-                    ]},
-                {class:'商城',icon:'/book/mall.png','list':[
-                    {title:'启用小程序商城',page:''}
-                    ]},
-                {class:'客户',icon:'/book/customer.png','list':[
-                    {title:'添加客户',page:'/admin/book/addCustomer'},
-                    {title:'将客户分等级',page:''},
-                    {title:'客户欠款和月底结账',page:''},
-                    {title:'同行的管理',page:''}
-                    ]},
-                {class:'价格',icon:'/book/price.png','list':[
-                    {title:'加价批量修改',page:''},
-                    {title:'价格批量修改',page:''},
-                    {title:'自动改价',page:''},
-                    {title:'手动改价',page:''}
-                    ]},
-                {class:'花材和分类',icon:'/book/item.png','list':[
-                    {title:'添加花材',page:''},
-                    {title:'修改花材',page:''},
-                    {title:'小菊的管理',page:''},
-                    {title:'添加和修改分类',page:''}
-                    ]},
-                {class:'采购与供应商',icon:'/book/cg.png','list':[
-                    {title:'添加供应商',page:''},
-                    {title:'到货录采购单',page:''},
-                    {title:'使用标准模式',page:''},
-                    {title:'跟供应商结账',page:''}
-                    ]},
-                {class:'开单',icon:'/book/kd.png','list':[
-                    {title:'给花店开单',page:''},
-                    {title:'给散客开单',page:''},
-                    {title:'PDA极速开单方式(即将上线)',page:''},
-                    {title:'客户自助下单',page:''},
-                    {title:'退货和退款',page:''},
-                    {title:'修改订单',page:''},
-                    {title:'开启新订单通知',page:''},
-                    {title:'订单打印',page:''},
-                    ]},
-                {class:'库存管理',icon:'/book/stock.png','list':[
-                    {title:'花材报损',page:''},
-                    {title:'花材盘点',page:''}
-                    ]},
-                {class:'员工',icon:'/book/staff.png','list':[
-                    {title:'添加和删除员工',page:''},
-                    {title:'新订单通知员工',page:''}
-                    ]},
-                {class:'营销',icon:'/book/market.png','list':[
-                    {title:'处理花材做特价',page:''}
-                    ]},
-                {class:'资金管理',icon:'/book/capital.png','list':[
-                    {title:'提现',page:''},
-                    {title:'余额变动明细',page:''},
-                    ]},
-                {class:'数据统计',icon:'/book/stat.png','list':[
-                    {title:'数据统计',page:''},
-                    ]},
-                {class:'分店管理',icon:'/book/shop.png','list':[
-                    {title:'新增分店',page:''},
-                    {title:'切换分店',page:''},
-                    {title:'调拨出库',page:''},
-                    {title:'调拨入库',page:''},
-                    {title:'取消入库',page:''},
-                    ]},
-                {class:'更多',icon:'/book/more.png','list':[
-                    {title:'了解我们',page:''},
-                    ]},
-            ]
+            book:[]
 		};
 		};
 	},
 	},
 	onShow() {
 	onShow() {
 
 
 	},
 	},
 	methods: {
 	methods: {
+        goDetail(item){
+            this.$util.pageTo({url: '/admin/book/detail',query:{id:item.id}})
+        },
 		init() {
 		init() {
-
+            let that = this
+            getBookList().then(res => {
+                that.book = res.data.list
+            });
 		}
 		}
 	}
 	}
 };
 };
@@ -133,7 +69,7 @@ export default {
                 }
                 }
             }
             }
             .book-item{
             .book-item{
-                line-height: 60rpx;
+                line-height: 62rpx;
                 color:#008000;
                 color:#008000;
                 font-size:28rpx;
                 font-size:28rpx;
                 display:list-item;
                 display:list-item;

+ 0 - 56
ghsApp/src/admin/book/what.vue

@@ -1,56 +0,0 @@
-<template>
-	<view class="app-content">
-        <view class="title">销花宝,鲜花批发管理系统</view>
-        <view class="content">助力商家高效管理店铺,实现传统店铺转型升级。涵盖销售开单、进货采购、微会员、自动改价、云打印、库存盘点、业绩分析、线上商城的功能。手机、平板、电脑三端数据实时同步使用,让你轻松告别手写开单、手工计账等传统操作,随时生成报表,赚多赚少,库存剩余一目了然。</view>
-        <image class="image" :src="`${constant.imgUrl}/book/banner1.png`" mode="widthFix"></image>
-		<view class="video"><video id="myVideo" :src="videoUrl" object-fit="contain" style="width:600rpx;height:980rpx;"></video></view>
-	</view>
-</template>
-<script>
-export default {
-	name: "book-what",
-	components: {
-	},
-	mixins: [],
-	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 = 'https://api.shop.hzghd.com/jc/9discountPrice.mp4'
-		}
-	},
-};
-</script>
-<style lang="scss" scoped>
-.app-content{
-	padding:20rpx 20rpx 10rpx 20rpx;
-    .title{
-		font-weight: bold;
-		font-size:40rpx;
-		margin-bottom:18rpx;
-	}
-	.content{
-    	font-size:28rpx;
-	}
-	.image{
-		width:100%;
-		margin:5rpx 0 5rpx 0;
-	}
-	.video{
-		margin:0 auto;
-        text-align: center;
-	}
-}
-</style>

+ 1 - 1
ghsApp/src/admin/changePrice/list.vue

@@ -93,7 +93,7 @@ export default {
 		downloadTable(){
 		downloadTable(){
 
 
 			let level = 0
 			let level = 0
-			let levelList = ['大众价', '标准价', '黄金价','钻石价']
+			let levelList = ['散客价', '普店价', '银店价','金店价']
 			uni.showActionSheet({
 			uni.showActionSheet({
 				itemList: levelList,
 				itemList: levelList,
 				success: function (respond) {
 				success: function (respond) {

+ 2 - 2
ghsApp/src/admin/item/list.vue

@@ -7,7 +7,7 @@
 			</view>
 			</view>
 			<view style="padding:0 0rpx 0 20rpx;" >
 			<view style="padding:0 0rpx 0 20rpx;" >
 				<button class="admin-button-com middle blue" style="margin-right:10rpx;" @click="downloadTable()">价格表</button>
 				<button class="admin-button-com middle blue" style="margin-right:10rpx;" @click="downloadTable()">价格表</button>
-				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">添加花材</button>
+				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/ptItem/itemList' })">导入花材</button>
 			</view>
 			</view>
 		</view>
 		</view>
 		<view class="scroll-middle_bx">
 		<view class="scroll-middle_bx">
@@ -101,7 +101,7 @@ export default {
 		downloadTable(){
 		downloadTable(){
 
 
 			let level = 0
 			let level = 0
-			let levelList = ['大众价', '标准价', '黄金价','钻石价']
+			let levelList = ['散客价', '普店价', '银店价','金店价']
 			uni.showActionSheet({
 			uni.showActionSheet({
 				itemList: levelList,
 				itemList: levelList,
 				success: function (respond) {
 				success: function (respond) {

+ 1 - 1
ghsApp/src/admin/ptItem/components/Item.vue

@@ -5,7 +5,7 @@
 		</view>
 		</view>
 		<view class="cmd-info_bx" :class="type == STOCK_TYPE.WARN?'':'active'">
 		<view class="cmd-info_bx" :class="type == STOCK_TYPE.WARN?'':'active'">
 			<view class="tit">{{ info.name || "" }}</view>
 			<view class="tit">{{ info.name || "" }}</view>
-			<view class="kc">{{info.className}}<text v-if="info.select == 2" style="color:#1f1cc0;float:right;margin-right:80rpx;">已添加</text></view>
+			<view class="kc">{{info.className}}<text v-if="info.select == 2" style="color:#1f1cc0;float:right;margin-right:80rpx;">已导入</text></view>
 			<view class="num-open_bx">
 			<view class="num-open_bx">
 				<view class="open-bx warn">
 				<view class="open-bx warn">
 					单位:<text>{{ info.bigUnit }}</text>
 					单位:<text>{{ info.bigUnit }}</text>

+ 2 - 2
ghsApp/src/admin/ptItem/itemList.vue

@@ -5,7 +5,7 @@
 				<app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFnContrapose"/>
 				<app-search-module v-model="py" placeholder="输入字母搜索" @input="searchFnContrapose"/>
 			</view>
 			</view>
 			<view style="padding:0 0rpx 0 20rpx;" >
 			<view style="padding:0 0rpx 0 20rpx;" >
-				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/detail',type:2 })">自己添加</button>
+				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/detail',type:2 })">添加花材</button>
 			</view>
 			</view>
 		</view>
 		</view>
 		<view class="scroll-middle_bx">
 		<view class="scroll-middle_bx">
@@ -99,7 +99,7 @@ export default {
 		},
 		},
 		selectItem(item){
 		selectItem(item){
 			if(item.select == 2){
 			if(item.select == 2){
-				this.$msg("已添加")
+				this.$msg("已导入")
 				return
 				return
 			}
 			}
 			this.$util.pageTo({ url: '/admin/item/detail',type:2,query:{ptItemId:item.id}})
 			this.$util.pageTo({ url: '/admin/item/detail',type:2,query:{ptItemId:item.id}})

+ 1 - 1
ghsApp/src/admin/statistics/customSale.vue

@@ -238,7 +238,7 @@ export default {
 		updateLevel(item){
 		updateLevel(item){
 			let customId = item.customId
 			let customId = item.customId
 			let self = this
 			let self = this
-			let levelList = ['大众会员', '标准会员', '黄金会员', '钻石会员']
+			let levelList = ['散客', '普店', '银店', '金店']
 			uni.showActionSheet({
 			uni.showActionSheet({
 				itemList: levelList,
 				itemList: levelList,
 				success: function (respond) {
 				success: function (respond) {

+ 9 - 0
ghsApp/src/api/book/index.js

@@ -0,0 +1,9 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const getBookList = data => {
+	return https.get('/book/list', data)
+}
+
+export const getBookDetail = data => {
+	return https.get('/book/detail', data)
+}

+ 1 - 1
ghsApp/src/api/official/index.js

@@ -22,7 +22,7 @@ export const applyStatus = data => {
 }
 }
 
 
 /** *
 /** *
- * 免费申请
+ * 申请
  */
  */
 export const applyRegister = data => {
 export const applyRegister = data => {
 	return https.post('/apply/register', data)
 	return https.post('/apply/register', data)

+ 2 - 2
ghsApp/src/components/app-area-sel-bak.vue

@@ -3,12 +3,12 @@
 		<bottom-popup class="popup-wrap" :show="show" @close="hidePopup">
 		<bottom-popup class="popup-wrap" :show="show" @close="hidePopup">
 			<div class="map-wrap">
 			<div class="map-wrap">
 				<div class="map-top-tit-wrap">
 				<div class="map-top-tit-wrap">
-					<div class="map-top-tit">选择收货地址</div>
+					<div class="map-top-tit">地址</div>
 					<app-close icon="iconguanbi" @close="hidePopup" />
 					<app-close icon="iconguanbi" @close="hidePopup" />
 				</div>
 				</div>
 				<!-- 搜索 -->
 				<!-- 搜索 -->
 				<div class="map-search">
 				<div class="map-search">
-					<app-search-module placeholder="请输入你的收货地址" />
+					<app-search-module placeholder="请输入你的地址" />
 				</div>
 				</div>
 				<!-- 地图 -->
 				<!-- 地图 -->
 				<div class="map-box">
 				<div class="map-box">

+ 2 - 2
ghsApp/src/components/app-area-sel.vue

@@ -3,12 +3,12 @@
 		<bottom-popup class="popup-wrap" :show="showPopup" @close="hidePopup">
 		<bottom-popup class="popup-wrap" :show="showPopup" @close="hidePopup">
 			<div class="map-wrap">
 			<div class="map-wrap">
 				<div class="map-top-tit-wrap">
 				<div class="map-top-tit-wrap">
-					<div class="map-top-tit">选择收货地址</div>
+					<div class="map-top-tit">地址</div>
 					<app-close icon="iconguanbi" @close="hidePopup" />
 					<app-close icon="iconguanbi" @close="hidePopup" />
 				</div>
 				</div>
 				<!-- 搜索 -->
 				<!-- 搜索 -->
 				<div class="map-search">
 				<div class="map-search">
-					<app-search-module ref="aaaaa" placeholder="请输入你的收货地址" :focus="false" @input="searchFn" />
+					<app-search-module ref="aaaaa" placeholder="请输入你的地址" :focus="false" @input="searchFn" />
 				</div>
 				</div>
 				<!-- 地图 -->
 				<!-- 地图 -->
 				<!-- <div class="map-box">
 				<!-- <div class="map-box">

+ 1 - 1
ghsApp/src/ext.json

@@ -4,7 +4,7 @@
   "directCommit": false,
   "directCommit": false,
   "ext": {
   "ext": {
     "account": 12362,
     "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
+    "apiHost": "http://api.shop.hzghd.com",
     "socketApiHost": "api.shop.hzghd.com",
     "socketApiHost": "api.shop.hzghd.com",
     "imgHost": "https://img.hzghd.com",
     "imgHost": "https://img.hzghd.com",
     "name":"花掌柜"
     "name":"花掌柜"

+ 2 - 2
ghsApp/src/mixins/globalMixins.js

@@ -19,7 +19,7 @@ export default {
       AUTHORITY_SHOW: false,
       AUTHORITY_SHOW: false,
       shopAdminId: null,
       shopAdminId: null,
       MODEL_TITLE: '您还没有开店',
       MODEL_TITLE: '您还没有开店',
-      MODEL_BTN_TEXT: '免费申请',
+      MODEL_BTN_TEXT: '申请',
       EXPER_AUTH_SHOW: false
       EXPER_AUTH_SHOW: false
 		}
 		}
 	},
 	},
@@ -94,7 +94,7 @@ export default {
     }
     }
     if (uni.getStorageSync('HOME_REFRESH') == '2') {
     if (uni.getStorageSync('HOME_REFRESH') == '2') {
       this.MODEL_TITLE = '您还没有开店哦'
       this.MODEL_TITLE = '您还没有开店哦'
-      this.MODEL_BTN_TEXT = '免费申请'
+      this.MODEL_BTN_TEXT = '申请'
       this.AUTHORITY_SHOW = true
       this.AUTHORITY_SHOW = true
       uni.hideTabBar()
       uni.hideTabBar()
     }
     }

+ 2 - 3
ghsApp/src/pages.json

@@ -557,8 +557,7 @@
 			"root": "admin/book",
 			"root": "admin/book",
 			"pages": [
 			"pages": [
 				{"path": "index","style": {"navigationBarTitleText": "使用教程"}},
 				{"path": "index","style": {"navigationBarTitleText": "使用教程"}},
-				{"path": "what","style": {"navigationBarTitleText": "关于销花宝"}},
-				{"path": "addCustomer","style": {"navigationBarTitleText": "添加客户"}}
+				{"path": "detail","style": {"navigationBarTitleText": ""}}
 			]
 			]
 		}
 		}
 	],
 	],
@@ -610,4 +609,4 @@
 			}
 			}
 		]
 		]
 	}
 	}
-}
+}

+ 1 - 1
ghsApp/src/pagesClient/member/add.vue

@@ -23,7 +23,7 @@
 					<input v-model="form.address" placeholder-class="phcolor" class="tui-input" name="confirmMobile" placeholder="请输入" maxlength="50" type="text" />
 					<input v-model="form.address" placeholder-class="phcolor" class="tui-input" name="confirmMobile" placeholder="请输入" maxlength="50" type="text" />
 				</tui-list-cell>
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
 				<tui-list-cell class="line-cell" :hover="false">
-					<div class="tui-title">允许欠款</div>
+					<div class="tui-title">欠款开关</div>
 					<switch :checked="form.debt" @change="form.debt = !form.debt" color="#3385FF"/>
 					<switch :checked="form.debt" @change="form.debt = !form.debt" color="#3385FF"/>
 				</tui-list-cell>
 				</tui-list-cell>
 				<tui-list-cell class="line-cell" :hover="false">
 				<tui-list-cell class="line-cell" :hover="false">

+ 2 - 2
ghsApp/src/pagesClient/member/detail.vue

@@ -78,7 +78,7 @@
               <div class="tui-title">历史帐单</div>
               <div class="tui-title">历史帐单</div>
             </tui-list-cell>
             </tui-list-cell>
             <tui-list-cell class="line-cell" :hover="false">
             <tui-list-cell class="line-cell" :hover="false">
-              <div class="tui-title">允许欠款</div>
+              <div class="tui-title">欠款开关</div>
               <div class="switch_bx">
               <div class="switch_bx">
                 <text></text>
                 <text></text>
                 <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" style="transform: scale(0.8,0.8)" />
                 <switch :checked="form.debt == 0 ? false : true" @change="remindChangeFn" style="transform: scale(0.8,0.8)" />
@@ -172,7 +172,7 @@ export default {
     changeLevel(){
     changeLevel(){
 
 
       let that = this
       let that = this
-      let levelList = ['大众会员', '标准会员', '黄金会员', '钻石会员']
+      let levelList = ['散客', '普店', '银店', '金店']
       uni.showActionSheet({
       uni.showActionSheet({
         itemList: levelList,
         itemList: levelList,
         success: function (respond) {
         success: function (respond) {

+ 3 - 13
ghsApp/src/pagesClient/official/index.vue

@@ -2,19 +2,11 @@
   <view class="app-content" style="background: #fff;">
   <view class="app-content" style="background: #fff;">
     <view class="header_logo">
     <view class="header_logo">
       <image :src="`${constant.imgUrl}/ghs/home_page/logo.png`" mode="widthFix"></image>
       <image :src="`${constant.imgUrl}/ghs/home_page/logo.png`" mode="widthFix"></image>
-
-					<view class="header_logo-more">
-						<view @click="register()" class="free_register" v-if="getLoginInfo.openShop == 1">免费申请</view>
-						<view v-if="getLoginInfo.openShop != 1" class="free_register">已申请</view>
-					</view>
-
-
     </view>
     </view>
     <view class="main">
     <view class="main">
       <view class="banner_box">
       <view class="banner_box">
         <image class="banner" :src="`${constant.imgUrl}/ghs/home_page/banner.png`"></image>
         <image class="banner" :src="`${constant.imgUrl}/ghs/home_page/banner.png`"></image>
-        <view v-if="getLoginInfo.openShop == 1" @click="register()">立即申请</view>
-        <div v-if="getLoginInfo.openShop != 1">已申请</div>
+        <view @click="register()">申请</view>
       </view>
       </view>
       <image class="pic1" :src="`${constant.imgUrl}/ghs/home_page/pic01.png`"></image>
       <image class="pic1" :src="`${constant.imgUrl}/ghs/home_page/pic01.png`"></image>
       <view class="intro">
       <view class="intro">
@@ -32,8 +24,7 @@
     </view>
     </view>
     <view class="footer_bar">
     <view class="footer_bar">
       <view class="relation">联系我们</view>
       <view class="relation">联系我们</view>
-      <view class="free" @click="register()" v-if="getLoginInfo.openShop == 1">免费申请</view>
-      <div v-if="getLoginInfo.openShop != 1" class="free">已申请</div>
+      <view class="free" @click="register()">申请</view>
     </view>
     </view>
   </view>
   </view>
 </template>
 </template>
@@ -222,10 +213,10 @@ export default {
   align-items: center;
   align-items: center;
   padding: 0 30upx;
   padding: 0 30upx;
   box-sizing: border-box;
   box-sizing: border-box;
+  z-index: 9999;
   &>image{
   &>image{
     width: 190upx;
     width: 190upx;
     height: 49upx;
     height: 49upx;
-    // background-color: #eee;
   }
   }
 	.header_logo-more{
 	.header_logo-more{
 		display: flex;
 		display: flex;
@@ -245,7 +236,6 @@ export default {
 }
 }
 .main{
 .main{
   padding: 100upx 0 130upx;
   padding: 100upx 0 130upx;
-  // padding-bottom: 30upx;
   &>.banner_box{
   &>.banner_box{
     width: 100vw;
     width: 100vw;
     height: 750upx;
     height: 750upx;

+ 1 - 1
ghsApp/src/pagesClient/official/index111.vue

@@ -63,7 +63,7 @@
       query:{
       query:{
         ...option
         ...option
       }
       }
-		})">免费申请</div>
+		})">注册申请</div>
     <div v-if="status != 3 && this.getLoginInfo.openShop == 1" class="app-footer">已申请</div>
     <div v-if="status != 3 && this.getLoginInfo.openShop == 1" class="app-footer">已申请</div>
   </div>
   </div>
 </template>
 </template>

+ 1 - 1
ghsApp/src/pagesClient/official/pay.vue

@@ -52,7 +52,7 @@
             ...option
             ...option
           }
           }
 		})"
 		})"
-      >免费申请</button>
+      >申请</button>
       <button v-else class="admin-button-com middle blue" @click="wxPay">
       <button v-else class="admin-button-com middle blue" @click="wxPay">
         支付
         支付
       </button>
       </button>