Merge branches 'master' and 'web' of www.gitinn.com:proginn/boss

 Conflicts:

	dist/200.html

	dist/index.html

	dist/login/index.html

	dist/main/404/index.html

	dist/main/artificial_order/index.html

	dist/main/artificial_orders/index.html

	dist/main/balance_change/index.html

	dist/main/cats copy/index.html

	dist/main/cats/index.html

	dist/main/cert_check/index.html

	dist/main/cert_edit/index.html

	dist/main/cert_pro/index.html

	dist/main/cloud_balance/index.html

	dist/main/cloud_developer/index.html

	dist/main/cloud_job/index.html

	dist/main/cloud_order copy/index.html

	dist/main/dev_check/index.html

	dist/main/dev_check_detail/index.html

	dist/main/dev_show/index.html

	dist/main/gongmall/index.html

	dist/main/group_list/index.html

	dist/main/index.html

	dist/main/job/index.html

	dist/main/jobs/index.html

	dist/main/orders/index.html

	dist/main/orders_detail/index.html

	dist/main/orders_frozen/index.html

	dist/main/outsource_bill/index.html

	dist/main/present_job_apply/index.html

	dist/main/publish_present/index.html

	dist/main/solution/index.html

	dist/main/solution_detail/index.html

	dist/main/user_bills/index.html

	dist/main/user_credit_item/index.html

	dist/main/user_credit_list/index.html

	dist/main/user_credit_setting/index.html

	dist/main/vip_manager/index.html

	dist/main/vip_order/index.html

	dist/main/vip_setting/index.html

	dist/main/wage_details/index.html

	dist/main/wage_settlement/index.html

	dist/main/wait_expend/index.html

	dist/main/withdraw/index.html

	dist/main/work_bill/index.html

pages/main/index/solution_detail.vue

@@ -237,14 +237,14 @@
       },
       async userinfo(uid) {
         let url = window.location.href;
-        
+
           window.open(this.$store.state.domainConfig.siteUrl +`/rooter/user/${uid}`)
       },
       async woinfo(uid) {
         let url = window.location.href;
-        
+
           window.open(this.$store.state.domainConfig.siteUrl +`/wo/${uid}`)
-        
+
       },
       async returnPage() {
         let url = window.location.href;
@@ -252,9 +252,9 @@
       },
       async companyVerifyStatus(uid) {
         let url = window.location.href;
-        
+
           window.open(this.$store.state.domainConfig.siteUrl +`/rooter/companyVerifyAuditItem?uid=${uid}`)
-        
+
       },
       async updateStatus(item) {
         const result = 3;
@@ -310,7 +310,7 @@
         console.log('item', item)
         const { id } = item
         let url = window.location.href;
-        window.open(this.$store.state.domainConfig.siteUrl +`/kaifain/${id}`, '_black')
+        window.open(this.$store.state.domainConfig.siteUrl +`/kaifain/s/${id}.html`, '_black')
       }
     }
   }

pages/main/index/user_credit_setting.vue

@@ -19,16 +19,6 @@
           <el-form-item label="现价(分)" prop="real_price">
             <el-input v-model="items[i].real_price" type="number"></el-input>
           </el-form-item>
-          <el-form-item label="logo" prop="real_price">
-            <el-input v-model="items[i].logo"></el-input>
-          </el-form-item>
-          <br/>
-          <el-form-item label="简要描述" prop="real_price">
-            <el-input v-model="items[i].description"></el-input>
-          </el-form-item>
-          <el-form-item label="排序（整数）" prop="real_price">
-            <el-input v-model="items[i].order"></el-input>
-          </el-form-item>
           <el-form-item prop="can_buy">
             <el-checkbox label="支持购买" v-model="items[i].status_bool"></el-checkbox>
           </el-form-item>