Merge branch '0601optimize' into test

src/views/categroyManager/insideSetting/addressManager.vue

@@ -50,7 +50,7 @@
             placeholder="可用状态"
           >
             <el-option label="个人" value="0"></el-option>
-            <el-option label="公用" value="1"></el-option>
+            <el-option label="公共" value="1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>

src/views/reaplceMusicPlayer/modals/detail.vue

@@ -96,14 +96,14 @@
           prop="mobileNo"
           label="联系电话"
         ></el-table-column>
-        <el-table-column align="center" prop="actualAmount" label="现金">
+        <el-table-column align="center" prop="actualAmount" label="现金支付">
           <template slot-scope="scope">
             <div>
               {{ scope.row.actualAmount | moneyFormat }}
             </div>
           </template>
         </el-table-column>
-        <el-table-column align="center" prop="balance" label="余额">
+        <el-table-column align="center" prop="balance" label="余额支付">
           <template slot-scope="scope">
             <div>
               {{ scope.row.balance | moneyFormat }}