Merge branch 'master' into dev

hdApp/src/admin/billing/components/app-commodity2.vue

@@ -15,7 +15,7 @@
 				{{ info.name || "" }}
 			</view>
 			<view class="kc" style="position:absolute;top:55upx;z-index:99">
-				<block>备用字段</block>
+				已售{{ info.actualSold }}
 			</view>
 			<view class="kc num-open_bx flex-end">
 				<view class="price" style="position:absolute;top:55upx;font-weight:bold;" v-if="info.priceType == 1">

hdApp/src/admin/goods/stockChange.vue

@@ -60,7 +60,7 @@ export default {
 	},
 	onLoad(e) {
 		if(this.option.name){
-			uni.setNavigationBarTitle({ title: this.option.name+' 库存变动' })
+			uni.setNavigationBarTitle({title: this.option.name})
 		}
 	},
 	onReachBottom() {

mallApp/src/pages/home/mall.vue

@@ -25,7 +25,7 @@
 				<button class="buy-flower-btn" @click="buyHs()">
 					<view class="btn-content">
 						<view class="flower-icon-css"></view>
-						<text class="btn-text">花束花礼</text>
+						<text class="btn-text">花束商城</text>
 					</view>
 				</button>
 				<button class="buy-material-btn" @click="buyProduct()">
@@ -56,7 +56,7 @@
               <view class="goods-sales"></view>
             </view>
             <view class="goods-price">--</view>
-            <view class="buy-btn">查看</view>
+            <view class="buy-btn">选这个</view>
           </view>
         </view>
       </view>
@@ -82,7 +82,7 @@
                 <view class="goods-sales"></view>
               </view>
               <view class="goods-price">--</view>
-              <view class="buy-btn">查看</view>
+              <view class="buy-btn">选这个</view>
             </view>
           </view>
         </view>
@@ -703,7 +703,7 @@ page {
   color: red;
   border: 1upx solid red;
   border-radius: 10upx;
-  width: 80upx;
+  width: 90upx;
   text-align: center;
   padding: 5upx 0;
   font-size: 25upx;

mallApp/src/pages/home/recent.vue

@@ -77,9 +77,9 @@
 
               <view class="button_4 flex-col" @click.stop="bug(item)"><text class="text_13">花材</text></view>
 
-              <view class="button_9 flex-col" @click.stop="hs(item)"><text class="text_13">花束</text></view>
+              <view class="button_9 flex-col" @click.stop="hs(item)"><text class="text_13">花束商城</text></view>
 
-              <view class="button_15 flex-col" @click.stop="tj(item)"><text class="text_13">相册</text></view>
+              <view class="button_15 flex-col" @click.stop="tj(item)"><text class="text_13">花束相册</text></view>
 
               </view>
           </view>
@@ -419,9 +419,9 @@ page {
            line-height: 80upx;
            text-align: center;
            background-color: #FF2842;
-           width: 130upx;
+           width: 160upx;
            position: absolute;
-           right: 225upx;
+           right: 220upx;
            top: 165upx;
            border-radius: 20upx;
            z-index: 10;
@@ -438,9 +438,9 @@ page {
            line-height: 80upx;
            text-align: center;
            background-color: #FF2842;
-           width: 130upx;
+           width: 160upx;
            position: absolute;
-           right: 405upx;
+           right: 425upx;
            top: 165upx;
            border-radius: 20upx;
            z-index: 10;

mallApp/src/pages/item/item.vue

@@ -24,7 +24,7 @@
 				<button class="buy-flower-btn" @click="buyHs()">
 					<view class="btn-content">
 						<view class="flower-icon-css"></view>
-						<text class="btn-text">花束花礼</text>
+						<text class="btn-text">花束商城</text>
 					</view>
 				</button>
 			</view>