充值提醒

hdApp/src/admin/goods/add.vue

@@ -67,7 +67,7 @@
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存</view>
           <view class="btn-group">
-            <button class="admin-button-com middle" :class="[form.stockSet === '0' ? '' : 'default']" @click="setstockSet('0')">管够</button>
+            <button class="admin-button-com middle" :class="[form.stockSet === '0' ? '' : 'default']" @click="setstockSet('0')">足够</button>
             <button class="admin-button-com middle" :class="[form.stockSet === '1' ? '' : 'default']" @click="setstockSet('1')">自定义</button>
           </view>
         </tui-list-cell>
@@ -109,7 +109,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">商城上面</view>
+          <view class="tui-title">商城上</view>
           <view class="btn-group">
             <button class="admin-button-com middle" :class="[form.status === 1 ? '' : 'default']" @click="statusChange({detail:{value:'1'}})">展示</button>
             <button class="admin-button-com middle" :class="[form.status === 0 ? '' : 'default']" @click="statusChange({detail:{value:'0'}})">隐藏</button>

hdApp/src/admin/goods/detail.vue

@@ -77,7 +77,7 @@
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存</view>
           <view class="btn-group">
-            <button class="admin-button-com middle" :class="[form.stockSet === '0' ? '' : 'default']" @click="setstockSet('0')">管够</button>
+            <button class="admin-button-com middle" :class="[form.stockSet === '0' ? '' : 'default']" @click="setstockSet('0')">足够</button>
             <button class="admin-button-com middle" :class="[form.stockSet === '1' ? '' : 'default']" @click="setstockSet('1')">自定义</button>
           </view>
         </tui-list-cell>
@@ -119,7 +119,7 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">商城上面</view>
+          <view class="tui-title">商城上</view>
           <view class="btn-group">
             <button class="admin-button-com middle" :class="[form.status === '1' ? '' : 'default']" @click="statusChange({detail:{value:'1'}})">显示</button>
             <button class="admin-button-com middle" :class="[form.status === '0' ? '' : 'default']" @click="statusChange({detail:{value:'0'}})">隐藏</button>

hdApp/src/pages.json

@@ -284,7 +284,7 @@
 				{ "path": "kind", "style": { "navigationBarTitleText": "花束品类" } },
 				{ "path": "lzKind", "style": { "navigationBarTitleText": "绿植品类" } },
 				{ "path": "detail", "style": { "navigationBarTitleText": "商品详情" } },
-				{ "path": "add", "style": { "navigationBarTitleText": "新增" } },
+				{ "path": "add", "style": { "navigationBarTitleText": "新增商品" } },
 				{ "path": "selectItem", "style": { "navigationBarTitleText": "选择花材" } },
 				{ "path": "img-store", "style": { "navigationBarTitleText": "图库管理" } },
 				{ "path": "goods-name", "style": { "navigationBarTitleText": "填写商品信息" } },

mallApp/src/pages/home/category.vue

@@ -88,7 +88,7 @@
       </scroll-view>
     </block>
 
-    <wangCg :loginStyle.sync="globalLoginStyle" @goToLogin="loginTo()"></wangCg>
+    <wangCg :loginStyle.sync="globalLoginStyle" @goToLogin="loginTo()" @loginSuccess="loginSuccess"></wangCg>
   </view>
 </template>
 <script>
@@ -187,6 +187,9 @@ export default {
       let account = this.option.account?this.option.account:0
       this.$util.pageTo({url:"/pages/login/index?needBack=1&account="+account})
     },
+    loginSuccess(){
+      this.init()
+    },
     init(){
       this.hdId = this.option.hdId ? this.option.hdId : 0
       this.classInit()

mallApp/src/pages/member/rechargeResult.vue

@@ -13,7 +13,7 @@
             </view>
             <view class="confirm-btn-wrap">
               <button class="confirm-btn" @click="goBack">知道了</button>
-              <view class="tech-support">花掌柜小程序提供技术支持</view>
+              <view class="tech-support">花卉宝小程序提供技术支持</view>
             </view>
           </view>
         </view>
@@ -126,7 +126,7 @@
       }
       
       .tech-support {
-        font-size: 32upx;
+        font-size: 30upx;
         color: #999;
         text-align: center;
         line-height: 1.4;