zhengxin 5 лет назад
Родитель
Сommit
a0459cd46b

+ 16 - 0
ghs/.editorconfig

@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = tab
+indent_size = 1
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab

+ 50 - 8
ghs/src/admin/billing/affirm.vue

@@ -1,15 +1,57 @@
 <template>
-    <div>
-
-    </div>
+	<view class="affirm-page">
+		<view class="affirm-view"> </view>
+		<view class="under-bar">
+			<view class="price-view">
+				<text class="price-title">收款</text>
+				<text class="price-number">¥ <text class="large">114</text>.00</text>
+			</view>
+			<button class="admin-button-com blue middle">下单</button>
+		</view>
+	</view>
 </template>
 
 <script>
-    export default {
-        name:"BillingAffirm" // 开单确认 
-    }
+export default {
+	name: "BillingAffirm" // 开单确认
+};
 </script>
 
 <style lang="scss" scoped>
-
-</style>
+.affirm-page {
+	position: relative;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	.affirm-view {
+		flex: 1;
+		padding: 20px;
+	}
+	.under-bar {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 0 20px;
+		width: 100%;
+		height: 100px;
+		.price-view {
+			display: flex;
+			align-items: center;
+			font-size: 24px;
+			.price-title {
+				color: #333;
+			}
+			.price-number {
+				margin: 0 20px;
+				color: #ff2842;
+				.large {
+					font-size: 40px;
+				}
+			}
+		}
+		.admin-button-com {
+			width: 200px;
+		}
+	}
+}
+</style>

+ 104 - 58
ghs/src/admin/billing/components/Commodity.vue

@@ -1,92 +1,138 @@
 <template>
     <view class="item-cmd_bx">
         <view class="img_bx">
-            <app-img src="https://img.huaml.com/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg" alt="商品图" mode="aspectFit" :height="160" />
+            <app-img
+                src="https://img.huaml.com/uploads/12358/202005/29/de74c55596d304b85e79154958e8bf57_small.jpeg"
+                alt="商品图"
+                mode="aspectFit"
+                :height="160"
+            />
         </view>
         <view class="cmd-info_bx">
             <view class="tit">天使美人</view>
             <view class="kc">库存1982</view>
             <view class="num-open_bx">
                 <view class="price">¥389.50</view>
-                <view class="open-bx">
-                    <i class="iconfont icontianjiakehu"></i>
+                <view class="open-bx" v-if="type == COMMODITY_TYPE.COMMON">
+                    <i class="iconfont iconjianqu" @click="subtractEvent"></i>
                     <text class="num" @click="customNum">5/2</text>
-                    <i class="iconfont icontianjiakehu"></i>
+                    <i class="iconfont icontianjia" @click="addEvent"></i>
+                </view>
+                <view class="open-bx" v-else-if="type == COMMODITY_TYPE.CHANGE">
+                    <input
+                        class="change-input"
+                        type="text"
+                        placeholder="自动调价"
+                    />
+                    <i class="iconfont icondelete" @click="delEvent"></i>
                 </view>
             </view>
         </view>
-    
     </view>
 </template>
 
 <script>
-    import AppImg from '@/components/app-img'
-    export default {
-        name:'Commodity',
-        components:{
-            AppImg
+import { COMMODITY_TYPE } from "@/utils/declare";
+import AppImg from "@/components/app-img";
+export default {
+    name: "Commodity",
+    components: {
+        AppImg
+    },
+    props: {
+        type: {
+            type: String,
+            default: COMMODITY_TYPE.COMMON
+        }
+    },
+    data() {
+        return {
+            COMMODITY_TYPE
+        };
+    },
+    methods: {
+        customNum() {
+            this.$emit("customNum");
         },
-        data(){
-            return {
-                
-            }
+        addEvent() {
+            this.$emit("add");
         },
-        methods:{
-            customNum(){
-                this.$emit('customNum')
-            }
+        subtractEvent() {
+            this.$emit("subtract");
+        },
+        delEvent() {
+            this.$emit("del");
         }
     }
+};
 </script>
 
 <style lang="scss" scoped>
-    .item-cmd_bx {
-        position: relative;
-        .img_bx {
-            height: 160px;
-            width: 160px;
-            position: absolute;
-            left: 0px;
-            top: 0px;
+.item-cmd_bx {
+    position: relative;
+    margin-bottom: 20px;
+    .img_bx {
+        height: 160px;
+        width: 160px;
+        position: absolute;
+        left: 0px;
+        top: 0px;
+    }
+    .cmd-info_bx {
+        padding-left: 177px;
+        & .tit {
+            font-size: 28px;
+            font-weight: 400;
+            color: #333333;
+            padding-top: 10px;
         }
-        .cmd-info_bx {
-            padding-left: 177px;
-            & .tit {
-               font-size: 28px; 
-               font-weight: 400;
-               color: #333333;
-               padding-top: 10px;
-            }
-            & .kc {
-               color: #999999;
-               font-size: 24px;
-               padding: 8px 0 24px
+        & .kc {
+            color: #999999;
+            font-size: 24px;
+            padding: 8px 0 24px;
+        }
+        & .num-open_bx {
+            display: flex;
+            align-items: center;
+            & .price {
+                font-size: 28px;
+                color: #ff2842;
+                flex: 1;
             }
-            & .num-open_bx {
+            & .open-bx {
                 display: flex;
                 align-items: center;
-                & .price {
-                    font-size: 28px;
-                    color: #FF2842;
-                    flex: 1;
+                & .iconfont {
+                    color: #3385ff;
+                    font-size: 40px;
                 }
-                & .open-bx {
-                    display: flex;
-                    align-items: center;
-                    & .iconfont {
-                        color: #3385FF;
-                        font-size: 40px;
-                    }
-                    & > .num {
-                        display: inline-block;
-                        margin: 0 8px;
-                        color: #333333;
-                        border-radius: 22px;
-                        background-color: #F5F5F5;
-                        padding: 5px 36px;
+                .icondelete {
+                    margin: 0 10px 0 30px;
+                    color: #ccc;
+                    &.edit {
+                        color: #3385ff;
                     }
                 }
+                & > .num {
+                    display: inline-block;
+                    margin: 0 8px;
+                    color: #333333;
+                    border-radius: 22px;
+                    background-color: #f5f5f5;
+                    padding: 5px 36px;
+                }
+                .change-input {
+                    width: 164px;
+                    height: 60px;
+                    line-height: 60px;
+                    text-align: center;
+                    background: #ffffff;
+                    border: 1px solid #dddddd;
+                    border-radius: 4px;
+                    font-size: 28px;
+                }
             }
         }
     }
-</style>
+}
+</style>

+ 66 - 63
ghs/src/admin/billing/components/FooterCart.vue

@@ -1,73 +1,76 @@
 <template>
-    <div class="cart-ft_bx">
-        <div class="cart-ct_bx">
-            <view class="cart-lf_bx">
-                <view class="cart-dot_bx">
-                    <i class="iconfont icontianjiakehu"></i>
-                </view>
-                <view class="price">
-                    ¥3566.88
-                </view>
-            </view>
-            <view class="cart-rg_bx">
-                选好了
-            </view>
-        </div>
-        
+  <div class="cart-ft_bx">
+    <div class="cart-ct_bx">
+      <view class="cart-lf_bx">
+        <view class="cart-dot_bx">
+          <i class="iconfont icongouwuche"></i>
+        </view>
+        <view class="price">
+          ¥3566.88
+        </view>
+      </view>
+      <view class="cart-rg_bx">
+        选好了
+      </view>
     </div>
+  </div>
 </template>
 
 <script>
-    export default {
-        name:"FooterCart"
-    }
+export default {
+  name: 'FooterCart',
+}
 </script>
 
 <style lang="scss" scoped>
-    .cart-ft_bx {
-        width: 702px;
-        height: 88px;
-        background-color: #444444;
-        position: fixed;
-        bottom: 15px;
-        border-radius: 50px;
-        left: 50%;
-        transform: translate(-50%,0);
-        z-index: 200;
-        overflow: hidden;
-        & .cart-ct_bx {
-            display: flex;
-            align-items: center;
-            height: 100%;
-            & .cart-lf_bx {
-                flex: 1;
-                display: flex;
-                align-items:center;
-                & .cart-dot_bx {
-                    width: 72px;
-                    height: 72px;
-                    border-radius: 50%;
-                    background-color: #3385FF;
-                    text-align: center;
-                    line-height: 72px;
-                    margin-left: 6px;
-                }
-                & .price {
-                    font-weight: 500;
-                    color: #FFFFFF;
-                    font-size: 36px;
-                    padding-left: 24px;
-                }
-            }
-            & .cart-rg_bx {
-                height: 100%;
-                width: 200px;
-                text-align: center;
-                font-size: 28px;
-                color: #FFFFFF;
-                background-color: #3385FF;
-                line-height: 88px;
-            }
+.cart-ft_bx {
+  width: 702px;
+  height: 88px;
+  background-color: #444444;
+  position: fixed;
+  bottom: 15px;
+  border-radius: 50px;
+  left: 50%;
+  transform: translate(-50%, 0);
+  z-index: 200;
+  overflow: hidden;
+  & .cart-ct_bx {
+    display: flex;
+    align-items: center;
+    height: 100%;
+    & .cart-lf_bx {
+      flex: 1;
+      display: flex;
+      align-items: center;
+      & .cart-dot_bx {
+        width: 72px;
+        height: 72px;
+        border-radius: 50%;
+        background-color: #3385ff;
+        text-align: center;
+        line-height: 72px;
+        margin-left: 6px;
+        .iconfont {
+          font-size: 40px;
+          color: #fff;
         }
+      }
+      & .price {
+        font-weight: 500;
+        color: #ffffff;
+        font-size: 36px;
+        padding-left: 24px;
+      }
+    }
+    & .cart-rg_bx {
+      height: 100%;
+      width: 200px;
+      text-align: center;
+      font-size: 28px;
+      color: #ffffff;
+      background-color: #3385ff;
+      line-height: 88px;
     }
-</style>
+  }
+}
+</style>

+ 270 - 254
ghs/src/admin/billing/index.vue

@@ -1,266 +1,282 @@
 <template>
-    <view class="billing_box_bg">
-        <view class="input-wrap">
-			<app-search-module 
-            placeholder="请输入关键词搜索" @search="searchFn" />
+	<view class="billing_box_bg">
+		<view class="input-wrap">
+			<app-search-module placeholder="请输入关键词搜索" @search="searchFn" />
 		</view>
-        <app-tabs 
-            :tabs="tabs"  
-            :currentTab="tabIndex" 
-            @change="change" 
-            itemWidth="33.33%" />
-        <view class="scroll-middle_bx">
-            <scroll-view
-            scroll-y
-            scroll-with-animation
-            class="tab-view"
-            :scroll-top="scrollTop"
-            >
-            <div
-            v-for="(item,index) in tabbar"
-            :key="index"
-            class="tab-bar-item"
-            :class="[currentTab==index ? 'active' : '']"
-            :data-current="index"
-            @tap.stop="swichNav($event ,item)"
-            >
-            <text>{{item.categoryName || '暂无'}}</text>
-            </div>
-            </scroll-view>
-            <block v-for="(item,index) in tabbar" :key="index">
-                <scroll-view
-                    scroll-y
-                    class="right-box"
-                    v-if="currentTab==index"
-                >
-                <view class="item_list_bx">
-                    <Commondity @customNum="customNum"></Commondity>
-                </view>
-                 
-                <!--内容部分 start -->
-                <!-- v-if="!$util.isEmpty(list.data)" -->
-                   
-                <!-- <block v-else>
+		<app-tabs
+			:tabs="tabs"
+			:currentTab="tabIndex"
+			@change="change"
+			itemWidth="50%"
+		/>
+		<view class="scroll-middle_bx">
+			<scroll-view
+				scroll-y
+				scroll-with-animation
+				class="tab-view"
+				:scroll-top="scrollTop"
+			>
+				<div
+					v-for="(item, index) in tabbar"
+					:key="index"
+					class="tab-bar-item"
+					:class="[currentTab == index ? 'active' : '']"
+					:data-current="index"
+					@tap.stop="swichNav($event, item)"
+				>
+					<text>{{ item.categoryName || "暂无" }}</text>
+					<text class="tag">4/10</text>
+				</div>
+			</scroll-view>
+			<block v-for="(item, index) in tabbar" :key="index">
+				<scroll-view scroll-y class="right-box" v-if="currentTab == index">
+					<view class="item_list_bx">
+						<view class="item_list_title">{{ item.categoryName }}</view>
+						<Commondity @customNum="customNum"></Commondity>
+						<Commondity
+							:type="COMMODITY_TYPE.CHANGE"
+							@customNum="customNum"
+						></Commondity>
+					</view>
+
+					<!--内容部分 start -->
+					<!-- v-if="!$util.isEmpty(list.data)" -->
+
+					<!-- <block v-else>
                     <app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
                 </block> -->
-                <!--内容部分 end -->
-                </scroll-view>
-            </block>
-        </view>
-                <!-- :maskClosable="false" -->
-        <modal-module
-            :show="isModel"
-            @cancel="modalCancel"
-            @click="affirm"
-            title="花之物语 红色系"
-            color="#333"
-            :size="32"
-            padding="30rpx 30rpx"
-        >
-        <template slot="customContent">
-            <view class="select-cmd_bx">
-                <view class="kc">
-                    库存972
-                </view>
-                <view class="num_bx">
-                    <input type="number" >扎
-                    <input type="number" style="margin-left:24upx" >支
-                </view>
-            </view>
-            
-        </template>
-    </modal-module>
-    <FooterCart></FooterCart>
-    </view>
+					<!--内容部分 end -->
+				</scroll-view>
+			</block>
+		</view>
+		<!-- :maskClosable="false" -->
+		<modal-module
+			:show="isModel"
+			@cancel="modalCancel"
+			@click="affirm"
+			title="花之物语 红色系"
+			color="#333"
+			:size="32"
+			padding="30rpx 30rpx"
+		>
+			<template slot="customContent">
+				<view class="select-cmd_bx">
+					<view class="kc">
+						库存972
+					</view>
+					<view class="num_bx">
+						<input type="number" />扎
+						<input type="number" style="margin-left:24upx" />支
+					</view>
+				</view>
+			</template>
+		</modal-module>
+		<FooterCart></FooterCart>
+	</view>
 </template>
 
 <script>
-    import AppSearchModule from '@/components/module/app-search'
-    import AppTabs from '@/components/plugin/tabs'
-    import AppWrapperEmpty from "@/components/app-wrapper-empty";
-    import Commondity from './components/Commodity'
-    import ModalModule from "@/components/plugin/modal";
-    import FooterCart from './components/FooterCart'
-    export default {
-        name: "Billing", // 开单
-        components: {
-         AppTabs,
-         AppSearchModule,
-         AppWrapperEmpty,
-         Commondity,
-         ModalModule,
-         FooterCart
-	    },
-        data() {
-            return {
-                tabIndex: 0,
-                tabs: [
-                    {
-                        name: '花材'
-                    },
-                    {
-                        name: '成品'
-                    },
-                    {
-                        name: '课程'
-                    },
-                ], 
-                tabbar:[
-                    {
-                        categoryName: "花束",
-                        delStatus: "0",
-                        description: "",
-                        goodsNum: "0",
-                        id: "95",
-                        img: "https://img.huaml.com",
-                        inTurn: "0",
-                        merchantId: "12358",
-                        parentId: "0",
-                        sold: "0",
-                        status: "1",
-                    },
-                    {
-                        categoryName: "花篮",
-                        delStatus: "0",
-                        description: "",
-                        goodsNum: "0",
-                        id: "96",
-                        img: "https://img.huaml.com",
-                        inTurn: "0",
-                        merchantId: "12358",
-                        parentId: "0",
-                        sold: "0",
-                        status: "1",
-                    }
-                ],
-                currentTab: 0,
-                isModel: false
-            }
-        },
-        methods:{
-            //自定义数量
-            customNum(){
-                this.isModel = true
-            },
-            modalCancel(){
-                this.isModel = false
-            }, // 取消 确认
-            affirm(val){
-                if(val.index === 0) {
-                    this.modalCancel()
-                }else{
-
-                }
-            },
-            change(e){
-                if (this.tabIndex == e.index) {
-                    return false;
-                } else {
-                    this.tabIndex = e.index;
-                }
-            },
-            searchFn(){
-
-            },
-            scrollTop(){
-
-            },
-            swichNav(e){
-                   let cur = e.currentTarget.dataset.current;
-                    if (this.currentTab == cur) {
-                        return false;
-                    } else {
-                        this.currentTab = cur;
-                        // this.form.categoryId = item.id;
-                        // this.resetList();
-                        // this._list();
-                        // this.checkCor()
-                    }
-            }
-        }
-    }
+import AppSearchModule from "@/components/module/app-search";
+import AppTabs from "@/components/plugin/tabs";
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import Commondity from "./components/Commodity";
+import ModalModule from "@/components/plugin/modal";
+import FooterCart from "./components/FooterCart";
+import { COMMODITY_TYPE } from "@/utils/declare";
+export default {
+	name: "Billing", // 开单
+	components: {
+		AppTabs,
+		AppSearchModule,
+		AppWrapperEmpty,
+		Commondity,
+		ModalModule,
+		FooterCart
+	},
+	data() {
+		return {
+			COMMODITY_TYPE,
+			tabIndex: 0,
+			tabs: [
+				{
+					name: "花材"
+				},
+				{
+					name: "成品"
+				}
+				// {
+				//     name: '课程'
+				// },
+			],
+			tabbar: [
+				{
+					categoryName: "花束",
+					delStatus: "0",
+					description: "",
+					goodsNum: "0",
+					id: "95",
+					img: "https://img.huaml.com",
+					inTurn: "0",
+					merchantId: "12358",
+					parentId: "0",
+					sold: "0",
+					status: "1"
+				},
+				{
+					categoryName: "花篮",
+					delStatus: "0",
+					description: "",
+					goodsNum: "0",
+					id: "96",
+					img: "https://img.huaml.com",
+					inTurn: "0",
+					merchantId: "12358",
+					parentId: "0",
+					sold: "0",
+					status: "1"
+				}
+			],
+			currentTab: 0,
+			isModel: false
+		};
+	},
+	methods: {
+		//自定义数量
+		customNum() {
+			this.isModel = true;
+		},
+		modalCancel() {
+			this.isModel = false;
+		}, // 取消 确认
+		affirm(val) {
+			if (val.index === 0) {
+				this.modalCancel();
+			} else {
+			}
+		},
+		change(e) {
+			if (this.tabIndex == e.index) {
+				return false;
+			} else {
+				this.tabIndex = e.index;
+			}
+		},
+		searchFn() {},
+		scrollTop() {},
+		swichNav(e) {
+			let cur = e.currentTarget.dataset.current;
+			if (this.currentTab == cur) {
+				return false;
+			} else {
+				this.currentTab = cur;
+				// this.form.categoryId = item.id;
+				// this.resetList();
+				// this._list();
+				// this.checkCor()
+			}
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-    .billing_box_bg {
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-        .input-wrap {
-            padding: 22px 20px 22px 30px;
-        }
-        .scroll-middle_bx {
-            flex: 1;
-        }
-        .tab-view {
-            height: 100%; 
-            width: 170upx;
-            position: fixed;
-            left: 0;
-            z-index: 10;
-            background-color: #f0f2f6;
-        .tab-bar-item {
-            width: 170upx;
-            height: 90upx;
-            box-sizing: border-box;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            font-size: 26upx;
-            color: #444;
-            font-weight: 400;
-        }
+.billing_box_bg {
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	.input-wrap {
+		padding: 22px 20px 22px 30px;
+	}
+	.scroll-middle_bx {
+		flex: 1;
+	}
+	.tab-view {
+		height: 100%;
+		width: 170upx;
+		position: fixed;
+		left: 0;
+		z-index: 10;
+		background-color: #f0f2f6;
+		.tab-bar-item {
+			position: relative;
+			width: 170upx;
+			height: 90upx;
+			box-sizing: border-box;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 26upx;
+			color: #444;
+			font-weight: 400;
+			.tag {
+				display: flex;
+				padding: 0 20px;
+				align-items: center;
+				position: absolute;
+				right: 0;
+				top: 0;
+				height: 32px;
+				background: #ff2842;
+				border-radius: 16px;
+				color: #fff;
+				font-size: 20px;
+			}
+		}
 
-        .active {
-            position: relative;
-            color: $mainColor;
-            font-size: 26px;
-            background: #fff;
-        }
+		.active {
+			position: relative;
+			color: $mainColor;
+			font-size: 26px;
+			background: #fff;
+		}
 
-        .active::before {
-            content: "";
-            position: absolute;
-            border-left: 8upx solid $mainColor;
-            height: 100%;
-            left: 0;
-        }
-        }
-        .right-box {
-        height: 100%;
-        width: 100%;
-        position: fixed;
-        padding-left: 170upx;
-        box-sizing: border-box;
-        left: 0;
-        }
-        .item_list_bx {
-            padding: 40px 16px;
-        }
-        .select-cmd_bx {
-            & .kc {
-                color: #999999;
-                font-size: 28px;
-                font-weight: 400;
-                margin-bottom: 60px;
-                text-align: center;
-                margin-top: 10px;
-            }
-            & .num_bx {
-                display: flex;
-                align-items: center;
-                margin-bottom: 80px;
-                & > input {
-                    width: 212px;
-                    height: 80px;
-                    border: 1px solid #DDDDDD;
-                    border-radius: 4px;
-                    text-align: center;
-                    margin-right: 24px;
-                }
-            }
-        }
-    }
-    
-    
-</style>
+		.active::before {
+			content: "";
+			position: absolute;
+			border-left: 8upx solid $mainColor;
+			height: 100%;
+			left: 0;
+		}
+	}
+	.right-box {
+		height: 100%;
+		width: 100%;
+		position: fixed;
+		padding-left: 170upx;
+		box-sizing: border-box;
+		left: 0;
+	}
+	.item_list_bx {
+		padding: 40px 16px;
+	}
+	.item_list_title {
+		margin-bottom: 20px;
+		font-size: 24px;
+		font-weight: 600;
+		color: #666666;
+	}
+	.select-cmd_bx {
+		& .kc {
+			color: #999999;
+			font-size: 28px;
+			font-weight: 400;
+			margin-bottom: 60px;
+			text-align: center;
+			margin-top: 10px;
+		}
+		& .num_bx {
+			display: flex;
+			align-items: center;
+			margin-bottom: 80px;
+			& > input {
+				width: 212px;
+				height: 80px;
+				border: 1px solid #dddddd;
+				border-radius: 4px;
+				text-align: center;
+				margin-right: 24px;
+			}
+		}
+	}
+}
+</style>

+ 63 - 0
ghs/src/admin/billing/result.vue

@@ -0,0 +1,63 @@
+<template>
+	<view class="billing_box_bg">
+		<view class="top-view"> </view>
+		<view class="result-view">
+			<view class="iconfont iconchenggong"></view>
+			<view class="result-title">开单成功</view>
+			<button class="admin-button-com blue big">发货详情</button>
+			<button class="admin-button-com big">打印单据</button>
+			<button class="admin-button-com big">继续开单</button>
+			<button class="admin-button-com big">订单列表</button>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: "BillingResult" // 开单结果
+};
+</script>
+
+<style lang="scss" scoped>
+.billing_box_bg {
+	position: relative;
+	padding: 60px 30px;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+
+	.top-view {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+
+		height: 299px;
+		background: #3385ff;
+		border-radius: 0px 0px 83px 83px;
+	}
+	.result-view {
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		padding: 70px;
+		width: 100%;
+		background: #ffffff;
+		border-radius: 20px;
+		z-index: 1;
+		.iconchenggong {
+			font-size: 170px;
+			color: $mainColor1;
+		}
+		.result-title {
+			margin: 50px 0 70px;
+			font-size: 32px;
+		}
+	}
+	.admin-button-com {
+		margin-bottom: 20px;
+		width: 100%;
+	}
+}
+</style>

+ 12 - 1
ghs/src/pages.json

@@ -380,6 +380,18 @@
 					"style": {
 						"navigationBarTitleText": "开单"
 					}
+				},
+				{
+					"path": "result",
+					"style": {
+						"navigationBarTitleText": "开单结果"
+					}
+				},
+				{
+					"path": "affirm",
+					"style": {
+						"navigationBarTitleText": "确认下单"
+					}
 				}
 			]
 		}
@@ -431,4 +443,3 @@
 		]
 	}
 }
-

+ 57 - 0
ghs/src/static/css/common.scss

@@ -6,6 +6,42 @@
     padding: 0;
 }
 
+page,
+view,
+scroll-view,
+swiper,
+movable-area,
+cover-view,
+text,
+icon,
+rich-text,
+progress,
+button,
+checkbox-group,
+checkbox,
+form,
+input,
+label,
+picker,
+picker-view,
+radio-group,
+slider,
+switch,
+textarea,
+navigator,
+audio,
+image,
+video,
+live-player,
+live-pusher,
+open-data,
+web-view {
+  //   font-family: 'Microsoft Yahei';
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
 page,
 body {
     font-family: "microsoft yahei";
@@ -13,6 +49,27 @@ body {
     // height: 100%;
     // line-height: 1;
 }
+
+.clearfix {
+}
+.clearfix:after {
+  display: block;
+  content: '';
+  clear: both;
+}
+
+.overscroll {
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+}
+
+.text-line {
+    word-break: keep-all;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  
 .app-wh100 {
     width: 100%;
     height: 100%;

+ 5 - 0
ghs/src/utils/declare.js

@@ -0,0 +1,5 @@
+//商品选购类别
+export const COMMODITY_TYPE = {
+  COMMON: '01',
+  CHANGE: '02',
+}