顺丰下单

ghsApp/src/admin/home/components/OrderItem.vue

@@ -75,7 +75,6 @@
                 <block v-if="currentStatus == 2">
                   <block v-if="item.book == 0">
                     <view><button @click.stop="directFh(item)" class="admin-button-com bule">发货</button> </view>
-                    <view><button @click.stop="fillNoFh(item)" class="admin-button-com bule">填单发货</button> </view>
                   </block>
                   <block v-else>
                     <view><button @click.stop="confirmFh(item)" class="admin-button-com bule">确认发货</button> </view>
@@ -83,7 +82,6 @@
                 </block>
                 <block v-else>
                   <view><button disabled="true" class="admin-button-com bule active">发货</button> </view>
-                  <view><button disabled="true" class="admin-button-com bule active">填单发货</button> </view>
                 </block>
                 <view v-if="currentStatus == 1">
                   <button disabled="true" class="admin-button-com bule active">打印(${item.printNum})</button>
@@ -97,14 +95,28 @@
             </view>
         </view>
 
-    <!-- 更多弹窗 -->
-    <uni-popup ref="morePopup" background-color="#fff" type="center" :animation="true" class="class-popup-style">
-      <view style="display:flex;flex-direction:column;padding:30upx 40upx;min-width:300upx;">
-        <button class="admin-button-com" style="margin-bottom:20upx;" @click="moreAction('操作1')">操作1</button>
-        <button class="admin-button-com" style="margin-bottom:20upx;" @click="moreAction('操作2')">操作2</button>
-        <button class="admin-button-com" @click="closeMore">取消</button>
-      </view>
-    </uni-popup>
+      <uni-popup ref="morePopup" background-color="#fff" type="center" :animation="true" class="class-popup-style">
+        <view style="padding:30upx 40upx;width:50vw;">
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;" @click="addExpress(item)">顺丰下单</button></view>
+          <view style="text-align: center;"><button class="admin-button-com" style="margin:0 auto 30upx auto;" @click="fillNoFh(item)">填单发货</button></view>
+          <view style="text-align: center;"><button class="admin-button-com default" @click="closeMore" style="margin:10upx auto 0 auto;">取消</button></view>
+        </view>
+      </uni-popup>
+
+      <!-- 新增顺丰下单弹窗 -->
+      <uni-popup ref="expressDialog" background-color="#fff" type="center" :animation="true" class="class-popup-style" :mask-click="false">
+        <view style="padding:40upx 50upx;width:70vw;">
+          <view style="font-size:32upx;font-weight:bold;text-align:center;margin-bottom:30upx;">顺丰下单信息</view>
+          <view style="margin-bottom:20upx;">省市区：广东省 深圳市 南山区</view>
+          <view style="margin-bottom:20upx;">详细地址：科技园南区高新南一道1号</view>
+          <view style="margin-bottom:20upx;">姓名：张三</view>
+          <view style="margin-bottom:20upx;">电话：13800138000</view>
+          <view style="text-align:center;margin-top:40upx;">
+            <button class="admin-button-com bule" style="width:200upx;" @click="confirmExpress">确认下单</button>
+            <button class="admin-button-com default" style="width:120upx;margin-left:30upx;" @click="closeExpressDialog">取消</button>
+          </view>
+        </view>
+      </uni-popup>
 
     </view>
 </template>
@@ -125,7 +137,7 @@ export default {
 	data() {
 		return {
       currentStatus:0
-		};
+    };
 	},
 	mounted(){
 		if(this.item.status){
@@ -143,6 +155,7 @@ export default {
       this.$util.pageTo({url: "/pagesOrder/arrival?id="+info.id})
     },
     fillNoFh(info){
+      this.closeMore()
 			this.$emit('fillNoFh', info)
     },
 		printOrder(item) {
@@ -161,9 +174,15 @@ export default {
     closeMore() {
       this.$refs.morePopup.close();
     },
-    moreAction(action) {
-      this.$msg('你点击了：' + action);
-      this.closeMore();
+    addExpress(item) {
+      this.$refs.expressDialog.open('center');
+    },
+    closeExpressDialog() {
+      this.$refs.expressDialog.close();
+    },
+    confirmExpress() {
+      this.closeExpressDialog();
+      this.$util && this.$util.toast ? this.$util.toast('已下单（示例）') : alert('已下单（示例）');
     },
 	}
 };