Merge branch 'develop' of gitee.com:darlk/ShengTangManage into develop

stdiet-custom/src/main/java/com/stdiet/custom/domain/SysOrder.java

@@ -181,6 +181,7 @@ public class SysOrder extends BaseEntity {
     @Excel(name = "成交时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date orderTime;
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
     public Date getStartTime() {
         return startTime;
     }

stdiet-custom/src/main/java/com/stdiet/custom/page/WxServeInfo.java

@@ -62,7 +62,7 @@ public class WxServeInfo implements Serializable {
     }
 
     public void setWeight(BigDecimal weight) {
-        this.weight = weight.toString() + "kg";
+        this.weight = weight.toString() + "斤";
     }
 
     @Override

stdiet-ui/src/views/custom/commision/detail/index.vue

@@ -136,9 +136,9 @@
       this.getList();
       getOptions().then(response => {
         this.options = response.data.reduce((opts, cur) => {
-          if (cur.postCode.startsWith('planner')) {
-            return opts;
-          }
+          // if (cur.postCode.startsWith('planner')) {
+          //   return opts;
+          // }
           if (!opts[cur.postId]) {
             opts[cur.postId] = [];
           }
@@ -152,8 +152,9 @@
           }
           return opts;
         }, {});
+        this.postIdOptions = this.postIdOptions.sort((a, b) => a.dictValue - b.dictValue);
         this.searchUserIdOptions = this.totalUserIdOptions.slice();
-      });
+      })
 
     },
     methods: {

stdiet-ui/src/views/custom/order/index.vue

@@ -228,7 +228,7 @@
       </el-table-column>
       <el-table-column label="体重" align="center" prop="weight" width="80">
         <template slot-scope="scope">
-          {{scope.row.weight ? `${scope.row.weight}kg` : ''}}
+          {{scope.row.weight ? `${scope.row.weight}斤` : ''}}
         </template>
       </el-table-column>
       <el-table-column label="手机号" align="center" prop="phone" width="120"/>
@@ -289,7 +289,8 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="体重" prop="weight">
-              <el-input v-model="form.weight" placeholder="请输入体重"/>
+                <el-input style="width: 100px" v-model="form.weight" placeholder="请输入体重"/>
+                斤
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -473,7 +474,7 @@
                 placeholder="选择开始日期"
                 format="yyyy-MM-dd"
                 value-format="yyyy-MM-dd"
-                :picker-options="startPickerOptions">
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>