Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghsApp/src/components/module/dorpdownSelect.vue

@@ -207,15 +207,15 @@
                     text-align: left;
                 }
                 & .item-child_box {
-                    display: flex;
-                    padding: 20px 0 20px;
+                    // display: flex;
+                    padding: 20px 0 0;
                     align-items: center;
-                    flex-flow: wrap;
-                    justify-content: space-between;
+                    // flex-flow: wrap;
+                    // justify-content: space-between;
                     & .admin-button-com {
-
                         margin-bottom: 20px;
                         padding: 18px 50px;
+                        margin-right: 20px;
                         &.custom {
                             width: 100%;
                         }

hdApp/src/admin/billing/result.vue

@@ -5,24 +5,29 @@
 }
 .zuhe-box{
 	width: 100%;
-	// margin-top: -30px;
+  padding:  0 20upx;
+	margin-bottom: 20px;
   background-color: #fff;
 	.zuhe-remark{
 		color: #333;
 		font-size: 32rpx;
     font-weight: 700;
     line-height: 88upx;
-    padding-left: 30upx;
-    border-bottom: 1px solid #eee;
+    // padding-left: 30upx;
+    // border-bottom: 1px solid #eee;
 	}
 	.zuhe-center{
-		margin-top: 20rpx;
+		// margin-top: 20rpx;
 		font-size: 28rpx;
-    margin: 0 30upx;
+    // margin: 0 30upx;
     height: 90upx;
     box-sizing: border-box;
     .zuhe-title{
       color: #666;
+    }
+    &>input{
+      border: 1px solid #eee!important;
+      border-radius: 5px!important;
     }
 		.zuhe-val{
 			position: relative;
@@ -49,7 +54,7 @@
 		}
 	}
   .border{
-    border-bottom: 1px solid #eee;
+    // border-bottom: 1px solid #eee;
   }
 }
 </style>
@@ -63,12 +68,11 @@
   <!--		<button class="admin-button-com big" @click="gotoOrderList">订单列表</button>-->
       <button class="admin-button-com big" @click="gotoPlace">继续开单</button>
       <button class="admin-button-com big" @click="gotoDetail">订单详情</button>
-      <view style="text-align: center;color: #868686" v-if="option.type === 'zuhe' && isGroup">
+      <view style="text-align: center;color: #868686;margin-top: 30upx;" v-if="option.type === 'zuhe' && isGroup">
         <view class="iconfont iconchenggong" style="color:#049E2C;margin-bottom:15rpx;font-size:80rpx;" ></view>
         <view>保存成功，请在【开单 - 成品】查看</view>
       </view>
-    </appResult>
-    <view class="zuhe-box" v-if="option.type === 'zuhe' && !isGroup">
+      <view class="zuhe-box" v-if="option.type === 'zuhe' && !isGroup">
         <view class="">
           <view class="zuhe-remark">保存此商品组合，以便下次取用：</view>
           <view class="flex-space zuhe-center border">
@@ -81,12 +85,11 @@
               <view class="uni-input">{{type[index].categoryName}}</view>
             </picker>
           </view>
-          
         </view>
       </view>
-      <view class="flex-center" style="margin-top: 30rpx" v-if="option.type === 'zuhe' && !isGroup">
-            <button class="admin-button-com blue big" style="width: calc(100vw - 60upx);" @click="SubSaveItemGroup">保存</button>
-          </view>
+      <button class="admin-button-com blue big" @click="SubSaveItemGroup" v-if="option.type === 'zuhe' && !isGroup">保存</button>
+    </appResult>
+    
   </view>
 </template>
 

hdApp/src/components/module/dorpdownSelect.vue

@@ -208,13 +208,15 @@ export default {
         text-align: left;
       }
       & .item-child_box {
-        display: flex;
-        padding: 20px 0 20px;
+        // display: flex;
+        padding: 20px 0 0;
         align-items: center;
-        flex-flow: wrap;
-        justify-content: space-between;
+        // flex-flow: wrap;
+        display: inline-block;
+        // justify-content: space-between;
         & .admin-button-com {
           margin-bottom: 20px;
+          margin-right: 20px;
           padding: 18px 50px;
           &.custom {
             width: 100%;

hdApp/src/pagesStorehouse/inventory/details.vue

@@ -52,24 +52,18 @@
 								</view>
 							</view>
 							<view v-else-if="column.custom == 'stock'">
-								<text >{{ `${item.bigNum}/` }}</text>
-								<text>{{ item.smallNum }}</text>
+								<text>{{ `${item.bigNumStock}/` }}</text>
+								<text>{{ item.smallNumStock }}</text>
 							</view>
 							<view v-else-if="column.custom == 'inventory'">
-								<text >{{ `${item.bigNumStock}/` }}</text>
-								<text>{{ item.smallNumStock }}</text>
+								<text>{{ `${item.bigNum}/` }}</text>
+								<text>{{ item.smallNum }}</text>
 							</view>
 							<view v-else-if="column.custom == 'profit'">
-								<text v-if="item.bigNumProfitLoss > 0">
-									{{ `${item.bigNumProfitLoss}/` }}
-								</text>
-								<text>
-									{{ item.smallNumProfitLoss }}
-								</text>
-							</view>
-							<view v-else>
-								{{ item[column.dataIndex] || "" }}
+								<text>{{ `${item.bigNumProfitLoss}/` }}</text>
+								<text>{{ item.smallNumProfitLoss }}</text>
 							</view>
+							<view v-else>{{ item[column.dataIndex] || "" }}</view>
 						</t-td>
 					</t-tr>
 				</t-table>
@@ -79,12 +73,8 @@
 			<view class="info-view">
 				盈亏合计：
 				<text class="price-item"> {{ sumCount }}扎 </text>
-				<text class="price-item red">
-					¥{{ dataInfo.price >= 0 ? dataInfo.price : "" }}
-				</text>
 			</view>
 		</view>
-    <kd-entrance></kd-entrance>
 	</view>
 </template>
 <script>

mallApp/src/pages.json

@@ -32,7 +32,8 @@
         {
             "path": "pages/home/course",
             "style": {
-                "navigationBarTitleText": "课程"
+                "navigationBarTitleText": "课程",
+                "enablePullDownRefresh": true
             }
         },
         {

mallApp/src/pages/class/index.vue

@@ -101,8 +101,9 @@ export default{
       });
     },
     successFn() {
-      uni.navigateTo({
-        url: '/pages/class/paySuccess'
+      this.pageTo({
+        url: '/pages/class/paySuccess',
+        type: 2
       })
     },
     errorFn() {

mallApp/src/pages/home/course.vue

@@ -42,9 +42,6 @@ export default {
       pageList: []
     }
   },
-  mounted(){
-    this.pxClassList()
-  },
   onShow () {
     uni.hideTabBar();
   },
@@ -52,13 +49,16 @@ export default {
     tabClick (index) {
       this.currentTabIndex = index
     },
+    init() {
+      this.pxClassList()
+    },
     signUp(item) {
-      uni.navigateTo({
+      this.pageTo({
         url: '/pages/class/index?id=' + item.id + '&name=' + item.name + '&price=' + item.tuition + '&target=' + item.target
       })
     },
     pxClassList() {
-      pxClassList().then(res => {
+      return pxClassList().then(res => {
         console.log(res)
         this.pageList = res.data.list
       }).catch(err => {console.log(err)})