Merge remote-tracking branch 'origin/dev_test' into dev_test

src/pages/phone/components/standardSystemPopup.vue

@@ -22,7 +22,7 @@
     </div>
     <div class="popup-footer">
       <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleReset">重置</el-button>
-      <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleCancel">取消</el-button>
+      <!--<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="handleCancel">取消</el-button>-->
       <el-button class="common-button-primary" size="mini" icon="el-icon-check" type="primary" @click="handleOk">确定</el-button>
     </div>
   </van-popup>