shish 4 年之前
父節點
當前提交
9e79333185

+ 19 - 14
ghsApp/src/admin/item/xj.vue

@@ -1,7 +1,8 @@
 <template>
 	<view class="billing_box_bg">
     	<view class="input-wrap">
-			剩余:{{option.stock}}扎
+			<text style="margin-right:30rpx;">库存:{{parseFloat(option.stock)}}扎</text>
+			单价:<input @focus="option.price=''" style="border:1rpx solid #CCC;width:200rpx;" placeholder-style="color:#CCCCCC" v-model="option.price" type="digit" placeholder="请填写" />
 		</view>
 		<view class="scroll-middle_bx">
 			<block>
@@ -25,18 +26,16 @@
 							</view>
 						</view>
 					</view>
-					<view style="margin-top:30rpx;margin-bottom:20rpx;">
-						<text style="padding-top:50rpx;font-size:30rpx;font-weight:700;display:inline-block;">单价:</text>
-						<input class="change-input" @focus="option.price=''" placeholder-style="color:#CCCCCC" v-model="option.price" type="digit" placeholder="请填写" />
-					</view>
-					<view>
-						<button class="admin-button-com big default" @click="clearXj()">清除全部</button>
-						<button class="admin-button-com big default" @click="goBack()" style="margin-left:58rpx;padding:30rpx 55rpx 30rpx 55rpx;">返回</button>
-						<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:58rpx;padding:30rpx 65rpx; 30rpx 65rpx;" >确认</button>
-					</view>
 				</view>
 			</block>
 		</view>
+
+		<div class="app-footer footer-button">
+			<button class="admin-button-com big default" @click="clearXj()">清除全部</button>
+			<button class="admin-button-com big default" @click="goBack()" style="margin-left:58rpx;padding:30rpx 55rpx 30rpx 55rpx;">返回</button>
+			<button class="admin-button-com big blue" @click="confirmXj()" style="margin-left:58rpx;padding:30rpx 65rpx; 30rpx 65rpx;" >确认</button>
+		</div>
+
 	</view>
 </template>
 <script>
@@ -174,10 +173,7 @@ export default {
 		}
 	}
 	.scroll-middle_bx {
-		flex: 1;
-		display: flex;
-		width: 100%;
-		height: 100%;
+		margin-bottom:110rpx;
 	}
 	.tab-view {
 		height: 100%;
@@ -342,4 +338,13 @@ export default {
 	left:120rpx;
 	top:-36rpx;
 }
+.footer-button{
+	height:120rpx;
+	& > button:nth-child(1){
+		color:#999999;
+	}
+	& > button:nth-child(2){
+		color:#999999;
+	}
+}
 </style>

+ 3 - 3
ghsApp/src/pagesPurchase/supplier.vue

@@ -194,8 +194,8 @@ export default {
         left: 0upx;
         & > .btn_entrance {
           display: inline-block;
-          font-size: 25upx;
-          color: #999;
+          font-size: 26upx;
+          color: #CCCCCC;
           padding: 10upx 20upx;
           margin-left: 20upx;
           text-decoration:underline;
@@ -218,7 +218,7 @@ export default {
     font-size:30rpx;
   }
   .add-ghs{
-    margin-right:20rpx;
+    margin-right:30rpx;
   }
 }
 </style>

+ 40 - 9
hdApp/src/pagesInvite/inviteShop.vue

@@ -3,13 +3,18 @@
     <view class="img_box">
       <image :src="imgUrl" class="img_url"></image>
     </view>
-    <!-- 确认 -->
-      <div class="confirm-btn">
-        <button class="admin-button-com big blue" @click="downloadImg">保存图片邀请</button>
-      </div>
-      <div class="confirm-btn1">
-        <button class="admin-button-com big blue" @click="goToMallPt()">直接打开邀请</button>
-      </div>
+    <view class="intro">
+      <view>1、保存图片分享给供应商,供应商识别并注册</view>
+      <view>2、直接打开分享给供应商注册也可以</view>
+      <view>3、奖金分二次发放,供应商注册并审核通过奖励10元,供应商线上营业额达20万元,奖励290元</view>
+      <view>4、如有疑问,请<text style="color:blue" @click="getCustomService()">点我联系客服</text></view>
+    </view>
+    <div class="confirm-btn">
+      <button class="admin-button-com big blue" @click="downloadImg">保存图片邀请</button>
+    </div>
+    <div class="confirm-btn1">
+      <button class="admin-button-com big blue" @click="goToMallPt()">直接打开邀请</button>
+    </div>
   </view>
 </template>
 
@@ -28,6 +33,25 @@ export default {
     ...mapGetters({ loginInfo: "getLoginInfo" })
   },
   methods: {
+		getCustomService(){
+			let self = this;
+			uni.showModal({
+				title: "请加客服微信",
+				content: "15280215347",
+				cancelText: "取消",
+				confirmText: "复制",
+				success: function (res) {
+					if (res.confirm) {
+						uni.setClipboardData({
+							data: "15280215347",
+							success: function() {
+								self.$msg("已复制")
+							}
+						});
+					}
+				},
+			})
+		},
     init() {
       this.getImg()
       getWeixinId().then(res => {
@@ -88,6 +112,13 @@ export default {
 <style lang="scss" scoped>
 .app-content{
   overflow: hidden;
+  .intro{
+    padding:50rpx 35rpx 0 35rpx;
+    font-size:30rpx;
+    view{
+      margin-top:15rpx;
+    }
+  }
 }
 .img_box{
   height: 450upx;
@@ -95,13 +126,13 @@ export default {
   &>.img_url{
     height: 450upx;
     width: 450upx;
-    margin: 100upx auto;
+    margin: 50upx auto;
   }
 }
 // 按钮
 .confirm-btn {
   width: calc(100% - 60px);
-  margin: 100px 30px 20px;
+  margin: 50px 30px 20px;
   .admin-button-com {
     width: 100%;
   }

+ 1 - 1
hdApp/src/pagesInvite/list.vue

@@ -126,7 +126,7 @@ export default {
       this.pageTo({
         url: '/pagesInvite/inviteShop'
       })
-        //查看分享的路径,不要删除 shish 20210517
+        	//查看分享的路径,不要删除 shish 20210517
 			// console.log('pagesClient/official/index?hdShopAdminId='+this.loginInfo.shopAdminId)
 
 			// getWeixinId().then(res => {

+ 15 - 10
hdApp/src/pagesPurchase/order.vue

@@ -1,13 +1,7 @@
 <template>
   <view class="order-page">
-    <scroll-view
-      scroll-y
-      class="order_list"
-      scroll-view
-      v-if="tabIndex == 0"
-    >
+    <view class="order_list">
       <block>
-        <!-- 供应商列表 -->
         <block v-if="!$util.isEmpty(supplierList)">
           <view
             class="list_item"
@@ -41,7 +35,12 @@
           />
         </block>
       </block>
-    </scroll-view>
+    </view>
+
+    <view class="app-footer open_btn">
+			<view @click="inviteGhs" class="admin-button-com middle blue">邀请供货商加入,奖300元</view>
+		</view>
+
   </view>
 </template>
 
@@ -83,6 +82,11 @@ export default {
     })
   },
   methods: {
+		inviteGhs(){
+      this.pageTo({
+        url: '/pagesInvite/inviteShop'
+      })
+		},
     enter (item) {
       const { id } = item
 			uni.navigateTo({url:`/pagesPurchase/ghsProduct?id=${id}`, type: 2 })
@@ -147,6 +151,7 @@ export default {
     height: 100%;
     background: #f0f2f6;
     padding: 0 0 20upx;
+    margin-bottom:100rpx;
     .list_item {
       margin: 20upx 0 0;
       position: relative;
@@ -201,8 +206,8 @@ export default {
         left: 0upx;
         & > .btn_entrance {
           display: inline-block;
-          font-size: 25upx;
-          color: #999;
+          font-size: 26upx;
+          color: #CCCCCC;
           padding: 10upx 20upx;
           margin-left: 20upx;
           text-decoration:underline;