优化

hdApp/src/admin/cg/mall.vue

@@ -3,13 +3,23 @@
     <view class="img_box">
       <image :src="imgUrl" class="img_url"></image>
     </view>
-    <view style="margin:50upx 0 0 30upx;font-size:30upx;">保存图片到手机，可分享或打印张贴</view>
+    <view style="margin:0 auto;width:50vw;font-size:30upx;font-weight:bold;text-align:center;">花束</view>
     <div class="confirm-btn">
-      <button class="admin-button-com big blue" @click="downloadImg">保存图片</button>
+      <button class="admin-button-com big blue" style="width:50vw;" @click="downloadImg(imgUrl)">保存图片</button>
     </div>
-    <view style="margin:50upx 0 0 30upx;font-size:30upx;">打开直接分享给客户</view>
     <div class="confirm-btn1">
-      <button class="admin-button-com big blue" @click="goToMallPt()">打开商城</button>
+      <button class="admin-button-com big blue" style="width:50vw;" @click="goToMallPt('pages/home/category')">直接打开</button>
+    </div>
+
+    <view class="img_box">
+      <image :src="flowerImgUrl" class="img_url"></image>
+    </view>
+    <view style="margin:0 auto;width:50vw;font-size:30upx;font-weight:bold;text-align:center;">鲜花</view>
+    <div class="confirm-btn">
+      <button class="admin-button-com big blue" style="width:50vw;" @click="downloadImg(flowerImgUrl)">保存图片</button>
+    </div>
+    <div class="confirm-btn1">
+      <button class="admin-button-com big blue" style="width:50vw;" @click="goToMallPt('pages/item/item')">直接打开</button>
     </div>
   </view>
 </template>
@@ -17,11 +27,11 @@
 import { mainGetMallPoster } from '@/api/main/index'
 import { getWeixinId } from "@/api/invite/index";
 import { mapGetters } from "vuex";
-import { CURRENT_ENV } from '@/config'
 export default {
   data() {
     return {
       imgUrl: '',
+      flowerImgUrl:'',
       getappIdList: {}
     }
   },
@@ -35,16 +45,14 @@ export default {
         this.getappIdList = res.data
       });
     },
-    downloadImg(){
+    downloadImg(url){
       uni.downloadFile({
-        url: this.imgUrl,
+        url: url,
         success: (res) => {
           if (res.statusCode === 200) {
-            console.log(res)
             uni.saveImageToPhotosAlbum({
               filePath: res.tempFilePath,
               success: function (data) {
-                console.log(data)
                 uni.showToast({title:'下载成功!'})
               }
             });
@@ -54,13 +62,12 @@ export default {
     },
     getImg() {
       mainGetMallPoster().then(res => {
-        console.log(res)
         this.imgUrl = res.data.imgUrl
+        this.flowerImgUrl = res.data.flowerImgUrl
       }).catch(err => {})
     },
-    goToMallPt () {
+    goToMallPt (url) {
       // #ifdef MP-WEIXIN
-      let url = 'pages/home/index'
       let self = this
       console.log(url + '?account=' + self.loginInfo.shopId)
       uni.navigateToMiniProgram({
@@ -91,7 +98,7 @@ export default {
             console.log(miniOriginalId)
             sweixin.launchMiniProgram({
               id: miniOriginalId,
-              path: '/pages/home/index?account='+that.loginInfo.shopId,
+              path: '/'+url+'?account='+that.loginInfo.shopId,
               type: 0
             });
           } else {
@@ -119,18 +126,19 @@ export default {
   overflow: hidden;
 }
 .img_box{
-  height: 450upx;
+  height: 310upx;
   box-sizing: border-box;
   &>.img_url{
-    height: 450upx;
-    width: 450upx;
-    margin: 100upx auto;
+    height: 300upx;
+    width: 300upx;
+    margin: 20upx auto;
   }
 }
 // 按钮
 .confirm-btn {
   width: calc(100% - 60upx);
   margin: 30upx 30upx 20upx;
+  text-align:center;
   .admin-button-com {
     width: 100%;
   }
@@ -139,6 +147,7 @@ export default {
 .confirm-btn1 {
   width: calc(100% - 60upx);
   margin: 30upx 30upx 20upx;
+  text-align:center;
   .admin-button-com {
     width: 100%;
   }

mallApp/src/components/item/module/app-footer-cart.vue

@@ -51,7 +51,7 @@ export default {
 	height: 88upx;
 	background-color: #444444;
 	position: fixed;
-	bottom: 102upx;
+	bottom: 5upx;
 	border-radius: 50upx;
 	left: 50%;
 	transform: translate(-50%, 0);

mallApp/src/main.js

@@ -13,8 +13,8 @@ import globalMixins from './mixins/globalMixins'
 Vue.mixin(globalMixins)
 
 
-import tabBar from './components/item/app-tabbar.vue'
-Vue.component('tab-bar', tabBar)
+//import tabBar from './components/item/app-tabbar.vue'
+//Vue.component('tab-bar', tabBar)
 
 import store from './store'
 Vue.prototype.$store = store

mallApp/src/pages.json

@@ -1,7 +1,7 @@
 {
-    "pages": [{ "path": "pages/home/recent", "style": { "navigationBarTitleText": "我的花店" } },
+    "pages": [{ "path": "pages/home/recent", "style": { "navigationBarTitleText": "花店" } },
         { "path": "pages/home/index", "style": { "navigationBarTitleText": "首页" } },
-        { "path": "pages/home/category", "style": { "navigationBarTitleText": "分类" } },
+        { "path": "pages/home/category", "style": { "navigationBarTitleText": "所有分类" } },
         { "path": "pages/home/shop", "style": { "navigationBarTitleText": "门店" } },
         { "path": "pages/home/user", "style": { "navigationBarTitleText": "我的" } },
         { "path": "pages/home/course", "style": { "navigationBarTitleText": "课程", "enablePullDownRefresh": true } },

mallApp/src/pages/home/category.vue

@@ -26,7 +26,6 @@
         </block>
       </scroll-view>
     </block>
-    <tab-bar :current="1"></tab-bar>
   </view>
 </template>
 <script>

mallApp/src/pages/home/course.vue

@@ -25,7 +25,6 @@
         </view>
       </block>
     </scroll-view>
-    <tab-bar :current="2"></tab-bar>
   </view>
 </template>
 

mallApp/src/pages/home/index.vue

@@ -10,7 +10,6 @@
     <block v-else>
       <app-wrapper-empty title="暂无商品" is-empty="true" />
     </block>
-    <tab-bar :current="0"></tab-bar>
   </view>
 </template>
 <script>

mallApp/src/pages/home/recent.vue

@@ -5,7 +5,7 @@
       <view class="ghs_list_page flex-col" v-if="!$util.isEmpty(list)">
         <view class="ghs_list_area flex-col justify-end">
 
-            <view class="ghs_box flex-col justify-end" v-for="item in list" :key="item.id" @click="goTo(item)">
+            <view class="ghs_box flex-col justify-end" v-for="item in list" :key="item.id">
               <view class="image-text_7 flex-row justify-between">
                 <view class="section_1 flex-col">
                   <image class="logo" :src="item.cover" />
@@ -17,18 +17,18 @@
               </view>
               <view class="box_4 flex-col"></view>
               <view class="box_9">
-                <view class="tag_2" @click="pageTo({url:'/pagesPurchase/shopping'})"> <text>买花记录</text> </view>
-                <view class="tag_2" @click="pageTo({ url: '/admin/clear/list?ghsId='+ghsInfo.id})"> <text>结账记录</text> </view>
+                <view class="tag_2" @click="showTip()"> <text>待结订单</text> </view>
+                <view class="tag_2" @click="showTip()"> <text>结账记录</text> </view>
+                <view class="tag_2" @click="showTip()"> <text>买花记录</text> </view>
               </view>
-              <view class="button_4 flex-col"><text class="text_13">买花束</text></view>
-              <view class="button_5 flex-col"><text class="text_13">买散花</text></view>
+              <view class="button_4 flex-col" @click="bugHs(item)"><text class="text_13">买花束</text></view>
+              <view class="button_5 flex-col" @click="bugFlower(item)"><text class="text_13">买鲜花</text></view>
             </view>
 
         </view>
       </view>
-
       <view v-else>
-        <text style="margin-top:30upx;">暂无花店</text>
+        <text style="margin-top:30upx;margin-left:30upx;">暂无花店</text>
       </view>
     </view>
     <view class="app-main app-content" v-else>
@@ -94,16 +94,19 @@ export default {
   onLoad () {
   },
   methods: {
-    goTo(item){
-      this.pageTo({ url:'/pages/home/index?account='+item.id})
+    showTip(){
+      this.$msg('开发中')
+    },
+    bugFlower(item){
+      this.pageTo({ url:'/pages/item/item?account='+item.id})
+    },
+    bugHs(item){
+      this.pageTo({ url:'/pages/home/category?account='+item.id})
     },
     async init () {
-      try {
         const { data } = await getNewShop()
         this.list = data.list
         this.showGlInfo = data.showGlInfo
-      } catch (e) {
-      }
     }
   }
 };
@@ -249,15 +252,16 @@ export default {
             text-overflow:ellipsis;
           }
           .text_9 {
-            width: 533upx;
+            width: 250upx;
             height: 25upx;
-            overflow-wrap: break-word;
             color: rgba(153, 153, 153, 1);
             font-size: 26upx;
             text-align: left;
             white-space: nowrap;
+            text-overflow:ellipsis;
             line-height: 24upx;
             margin-top: 10upx;
+            overflow: hidden;
           }
         }
       }
@@ -268,9 +272,8 @@ export default {
         margin-top: 40upx;
       }
       .box_9 {
-        width: 100%;
         height: 65upx;
-        margin: 23upx 0 22upx 30upx;
+        padding: 23upx 0 22upx 30upx;
         .tag_2 {
           background-color: rgba(255, 255, 255, 1);
           border-radius: 8px;
@@ -279,7 +282,7 @@ export default {
           border: 1px solid rgba(221, 221, 221, 1);
           color: rgba(51, 51, 51, 1);
           font-size: 30upx;
-          margin:0 60upx 0 0;
+          margin:0 50upx 0 0;
           text-align:center;
           float:left;
           padding-left:20upx;
@@ -379,7 +382,7 @@ export default {
         background-size: 137upx 137upx;
         width: 130upx;
         position: absolute;
-        left: 600upx;
+        left: 595upx;
         top:90upx;
         border-radius:20upx;
         .text_13 {

mallApp/src/pages/home/shop.vue

@@ -37,7 +37,6 @@
       </tui-list-view>
     </view>
     <app-activily-coupon :show.sync="activeCoupon" :info="newUserGift" :introUserId="option.introUserId" />
-    <tab-bar :current="3" ></tab-bar>
   </view>
 </template>
 <script>

mallApp/src/pages/item/item.vue

@@ -71,7 +71,7 @@
 		<FooterCart :price="allPrice" :count="allCount" @confirm="confirmSelectEvent" ></FooterCart>
     	<sel-popup :show="popupShow" :info="infoData" @close="hidePopup" />
 		<app-activily-coupon :show.sync="isNewCustom" :info="newCustomGift" :ghsId="ghsId" />
-		<tab-bar :current="2" ></tab-bar>
+		
 	</view>
 </template>