wjx 2 anos atrás
pai
commit
f4371c231c

+ 2 - 1
config/proxy.ts

@@ -10,7 +10,8 @@
  export default {
   dev: {
     '/api/': {
-      target: 'http://47.97.38.17/api',
+      // target: 'http://47.97.38.17/api',
+      target: 'http://api.zanxiangwl.com',
       changeOrigin: true,
       pathRewrite: { '/api': '' },
     },

+ 1 - 1
src/pages/launchSystemNew/components/targetingTooltip/index.tsx

@@ -57,7 +57,7 @@ const TargetingTooltip: React.FC<Props> = (props) => {
     /**********************/
 
     useEffect(() => {
-        if (data && geoLocationList) {
+        if (data && geoLocationList && data?.targeting) {
             let newConten: ContentProps = {}
             newConten.unlimited = targetingData.filter((item: any) => !Object.keys(data?.targeting).includes(item.key))?.map((item: any) => item?.name)?.toString()
             Object.keys(data?.targeting)?.forEach((item: any) => {

+ 3 - 3
src/pages/launchSystemNew/launchManage/createAd/adgroupsCol.tsx

@@ -22,10 +22,10 @@ const AdgroupsCol = React.forwardRef((props: Props, ref) => {
         <div>广告版位: <span>{siteSet?.map((item: string) => SiteSetEnum[item]).toString()}</span></div>
         <div>投放日期: <span>{endDate ? beginDate + '~' + endDate : beginDate + '~' + '长期投放'}</span></div>
         <div>出价方式: <span>{BidModeEnum[bidMode]}</span></div>
-        <div>优化目标: <span>{OptimizationGoalEnum[optimizationGoal]}</span></div>
+        {optimizationGoal && <div>优化目标: <span>{OptimizationGoalEnum[optimizationGoal]}</span></div>}
         <div>出价类型: <span>{smartBidType === 'SMART_BID_TYPE_CUSTOM' ? '手动出价' : '自动出价'}</span></div>
-        <div>出价策略: <span>{BidStrategyEnum[bidStrategy]}</span></div>
-        <div>广告出价: <span>{bidAmount}{`元/${OptimizationGoalEnum[optimizationGoal]}`}</span></div>
+        {bidStrategy && <div>出价策略: <span>{BidStrategyEnum[bidStrategy]}</span></div>}
+        <div>广告出价: <span>{bidAmount}{`元/${OptimizationGoalEnum[optimizationGoal] || '千次曝光'}`}</span></div>
         <div>广告日预算: <span>{dailyBudget || '不限'}</span></div>
     </>
 })

+ 1 - 1
src/pages/user/login/index.tsx

@@ -305,7 +305,7 @@ const Login: React.FC<{}> = () => {
 
               </div> : <div className={`${styles.main}  ${isMobile ? '' : show ? '' : styles.login_hide}`}>
                 <h1>趣程运营管理后台</h1>
-                {(isMobile || location.origin === 'http://localhost:8000' || location.origin.includes('test')) && <div className={styles.tabs}>
+                {<div className={styles.tabs}>
                   <span onClick={() => { setTab(1) }} style={tab === 1 ? { color: localStorage.getItem('color') || '#24DB95' } : {}}>手机</span>
                   <span onClick={() => { setTab(2) }} style={tab === 2 ? { color: localStorage.getItem('color') || '#24DB95' } : {}}>钉钉</span>
                 </div>}

+ 2 - 1
src/services/api.ts

@@ -1,4 +1,5 @@
-export let api: any = process.env.NODE_ENV === 'development' ? 'api' : 'http://47.97.38.17/api'
+// export let api: any = process.env.NODE_ENV === 'development' ? 'api' : 'http://47.97.38.17/api'
+export let api: any = process.env.NODE_ENV === 'development' ? 'api' : 'http://api.zanxiangwl.com'
 export let dataApi: any = process.env.NODE_ENV === 'development' ? 'dapi' : `http://data.zanxiangnet.com`
 export let wxApi: any = process.env.NODE_ENV === 'development' ? 'wxapi' : `https://report.zanxiangwl.com`
 export let launchApi: any = `http://192.168.7.175:8018`